Hello community, here is the log from the commit of package saxon9 for openSUSE:Factory checked in at 2014-08-01 19:27:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon9 (Old) and /work/SRC/openSUSE:Factory/.saxon9.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "saxon9" Changes: -------- --- /work/SRC/openSUSE:Factory/saxon9/saxon9.changes 2014-06-30 22:50:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.saxon9.new/saxon9.changes 2014-08-01 19:27:01.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 11 14:42:36 UTC 2014 - tchvatal@suse.com + +- Fix update-alternatives code here. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon9.spec ++++++ --- /var/tmp/diff_new_pack.kWdH3R/_old 2014-08-01 19:27:02.000000000 +0200 +++ /var/tmp/diff_new_pack.kWdH3R/_new 2014-08-01 19:27:02.000000000 +0200 @@ -16,13 +16,13 @@ # -Summary: The SAXON XSLT Processor from Michael Kay -License: MPL-1.0 and Apache-2.0 -Group: Productivity/Publishing/XML # net.sf.saxon.om.XMLChar is from ASL-licensed Xerces Name: saxon9 Version: 9.4.0.7 Release: 0 +Summary: The SAXON XSLT Processor from Michael Kay +License: MPL-1.0 and Apache-2.0 +Group: Productivity/Publishing/XML Url: http://saxon.sourceforge.net/ Source0: https://downloads.sourceforge.net/project/saxon/Saxon-HE/9.4/saxon9-4-0-7sou... Source1: %{name}.saxon.script @@ -34,9 +34,6 @@ #Made from original pom file #Source7: http://irrational.googlecode.com/svn/trunk/maven-repo/net/sf/saxon/saxon-he/... Source7: saxon-he-9.4.0.7.pom -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - BuildRequires: ant BuildRequires: bea-stax-api BuildRequires: dom4j @@ -45,25 +42,24 @@ BuildRequires: unzip BuildRequires: xml-commons-apis BuildRequires: xom - Requires: bea-stax Requires: bea-stax-api -Provides: jaxp_transform_impl = %{version}-%{release} - Recommends: %{name}-scripts Recommends: xml-commons-resolver - +Provides: jaxp_transform_impl = %{version} # Older versions were split into multile packages -Obsoletes: %{name}-dom < %{version}-%{release} -Provides: %{name}-dom = %{version}-%{release} -Obsoletes: %{name}-jdom < %{version}-%{release} -Provides: %{name}-jdom = %{version}-%{release} -Obsoletes: %{name}-sql < %{version}-%{release} -Provides: %{name}-sql = %{version}-%{release} -Obsoletes: %{name}-xom < %{version}-%{release} -Provides: %{name}-xom = %{version}-%{release} -Obsoletes: %{name}-xpath < %{version}-%{release} -Provides: %{name}-xpath = %{version}-%{release} +Obsoletes: %{name}-dom < %{version} +Provides: %{name}-dom = %{version} +Obsoletes: %{name}-jdom < %{version} +Provides: %{name}-jdom = %{version} +Obsoletes: %{name}-sql < %{version} +Provides: %{name}-sql = %{version} +Obsoletes: %{name}-xom < %{version} +Provides: %{name}-xom = %{version} +Obsoletes: %{name}-xpath < %{version} +Provides: %{name}-xpath = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description The most recent version of the open-source implementation of XSLT 2.0 and XPath @@ -106,7 +102,6 @@ %description scripts Utility scripts for %{name}. - %prep %setup -q -c @@ -140,7 +135,6 @@ -Djdom.javadoc=%{_javadocdir}/jdom %install - # jars mkdir -p %{buildroot}%{_javadir} cp -p build/lib/saxon.jar %{buildroot}%{_javadir}/%{name}.jar @@ -162,8 +156,8 @@ install -p -m644 %{SOURCE5} %{buildroot}%{_mandir}/man1/%{name}q.1 # jaxp_transform_impl ghost symlink -ln -s %{_sysconfdir}/alternatives \ - %{buildroot}%{_javadir}/jaxp_transform_impl.jar +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{buildroot}%{_javadir}/jaxp_transform_impl.jar # a simple POM install -dm 755 %{buildroot}%{_mavenpomdir} @@ -175,18 +169,18 @@ update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ jaxp_transform_impl %{_javadir}/%{name}.jar 25 -%preun -{ - [ $1 -eq 0 ] || exit 0 +%postun +if [ $1 -eq 0 ] ; then update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar -} >/dev/null 2>&1 || : +fi %files %defattr(0644,root,root,0755) %{_javadir}/%{name}.jar %{_mavenpomdir}/JPP-%{name}.pom %{_mavendepmapfragdir}/%{name} -%ghost %{_javadir}/jaxp_transform_impl.jar +%{_javadir}/jaxp_transform_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %files manual %defattr(0644,root,root,0755) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org