Hello community, here is the log from the commit of package saxon8 for openSUSE:Factory checked in at 2014-08-01 19:27:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon8 (Old) and /work/SRC/openSUSE:Factory/.saxon8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "saxon8" Changes: -------- --- /work/SRC/openSUSE:Factory/saxon8/saxon8.changes 2013-09-11 17:19:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.saxon8.new/saxon8.changes 2014-08-01 19:27:02.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 11 14:38:02 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner. Fix update-alternatives. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon8.spec ++++++ --- /var/tmp/diff_new_pack.lHwHFf/_old 2014-08-01 19:27:03.000000000 +0200 +++ /var/tmp/diff_new_pack.lHwHFf/_new 2014-08-01 19:27:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package saxon8 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,43 +16,35 @@ # -%define section free %define resolverdir %{_sysconfdir}/java/resolver -%define stdname saxon8 -Summary: Java Basic XPath 2.0, XSLT 2.0, and XQuery 1.0 implementation -License: MPL-1.1 -Group: Development/Languages/Other - Name: saxon8 Version: B.8.8 Release: 0 +Summary: Java Basic XPath 2.0, XSLT 2.0, and XQuery 1.0 implementation +License: MPL-1.1 +Group: Development/Languages/Other Url: http://saxon.sourceforge.net/ Source0: http://download.sf.net/saxon/saxon-resources8-8.tar.bz2 Source1: %{name}.saxon.script Source2: %{name}.saxonq.script Source3: %{name}.build.script -Source4: %{stdname}.1 -Source5: %{stdname}q.1 +Source4: %{name}.1 +Source5: %{name}q.1 +BuildRequires: ant BuildRequires: bea-stax-api +BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: jdom >= 1.0-0.b7 +BuildRequires: unzip BuildRequires: xml-commons-apis BuildRequires: xom -%if ! %defined suse_version -BuildRequires: java-javadoc -BuildRequires: jdom-javadoc >= 1.0-0.b9.3jpp -%else -BuildRequires: ant -BuildRequires: java-devel -BuildRequires: unzip -%endif -Requires: /usr/sbin/update-alternatives +Requires: %{_sbindir}/update-alternatives Requires: bea-stax Requires: bea-stax-api Requires: jaxp_parser_impl Provides: jaxp_transform_impl -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Release 8.6 represents an important milestone in Saxonica's progressive @@ -72,26 +64,20 @@ Includes the command line interfaces and the JAVA APIs; also includes a standalone XPath API that doesn't depend on JAXP 1.3. - - %package manual -Summary: Manual for saxon8. +Summary: Manual for saxon8 Group: Development/Languages/Other %description manual Manual for saxon8. - - %package javadoc -Summary: Javadoc for saxon8. +Summary: Javadoc for saxon8 Group: Development/Languages/Other %description javadoc Javadoc for saxon8. - - %package demo Summary: Demos for saxon8 Group: Development/Languages/Other @@ -100,10 +86,8 @@ %description demo Demonstrations and samples for saxon8. - - %package sql -Summary: SQL support for saxon8. +Summary: SQL support for saxon8 Group: Development/Languages/Other Requires: %{name} = %{version}-%{release} @@ -111,8 +95,6 @@ Supports XSLT extensions for accessing and updating a relational database from within a stylesheet. - - %package jdom Summary: JDOM support for saxon8 Group: Development/Languages/Other @@ -124,8 +106,6 @@ Supports using a JDOM document as the input or output of transformations and queries. Requires jdom.jar on the classpath. - - %package dom Summary: DOM support for saxon8 Group: Development/Languages/Other @@ -140,10 +120,8 @@ (dom.jar, part of JAXP 1.3) to be on the classpath, if not running under JDK 1.5. - - %package xom -Summary: XOM support for saxon8. +Summary: XOM support for saxon8 Group: Development/Languages/Other Requires: %{name} = %{version}-%{release} Requires: xom @@ -153,10 +131,8 @@ Supports using a XOM document as the input or output of transformations and queries. Requires xom.jar on the classpath. - - %package xpath -Summary: XPATH support for saxon8. +Summary: XPATH support for saxon8 Group: Development/Languages/Other Requires: %{name} = %{version}-%{release} @@ -164,10 +140,8 @@ Provides support for the JAXP 1.3 XPath API. Requires the JAXP 1.3 version of jaxp-api.jar on the classpath, if not running under JDK 1.5. - - %package scripts -Summary: Utility scripts for saxon8. +Summary: Utility scripts for saxon8 Group: Development/Languages/Other Requires: %{name} = %{version}-%{release} Requires: javapackages-tools @@ -175,8 +149,6 @@ %description scripts Utility scripts for saxon8. - - %prep %setup -q -c mkdir src @@ -204,83 +176,71 @@ -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 %install -rm -rf $RPM_BUILD_ROOT # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p build/lib/%{stdname}.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-%{version}.jar -cp -p build/lib/%{stdname}-xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-xpath-%{version}.jar -cp -p build/lib/%{stdname}-xom.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-xom-%{version}.jar -cp -p build/lib/%{stdname}-sql.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-sql-%{version}.jar -cp -p build/lib/%{stdname}-jdom.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-jdom-%{version}.jar -cp -p build/lib/%{stdname}-dom.jar $RPM_BUILD_ROOT%{_javadir}/%{stdname}-dom-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +mkdir -p %{buildroot}%{_javadir} +cp -p build/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +cp -p build/lib/%{name}-xpath.jar %{buildroot}%{_javadir}/%{name}-xpath-%{version}.jar +cp -p build/lib/%{name}-xom.jar %{buildroot}%{_javadir}/%{name}-xom-%{version}.jar +cp -p build/lib/%{name}-sql.jar %{buildroot}%{_javadir}/%{name}-sql-%{version}.jar +cp -p build/lib/%{name}-jdom.jar %{buildroot}%{_javadir}/%{name}-jdom-%{version}.jar +cp -p build/lib/%{name}-dom.jar %{buildroot}%{_javadir}/%{name}-dom-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr build/api/* %{buildroot}%{_javadocdir}/%{name} # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} -cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -pr samples/* %{buildroot}%{_datadir}/%{name} # scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p %{buildroot}%{_bindir} sed 's,__RESOLVERDIR__,%{resolverdir},' < %{SOURCE1} \ - > $RPM_BUILD_ROOT%{_bindir}/%{stdname} + > %{buildroot}%{_bindir}/%{name} sed 's,__RESOLVERDIR__,%{resolverdir},' < %{SOURCE2} \ - > $RPM_BUILD_ROOT%{_bindir}/%{stdname}q -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 + > %{buildroot}%{_bindir}/%{name}q +mkdir -p %{buildroot}%{_mandir}/man1 sed 's,__RESOLVERDIR__,%{resolverdir},' < %{SOURCE4} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/%{stdname}.1 + > %{buildroot}%{_mandir}/man1/%{name}.1 sed 's,__RESOLVERDIR__,%{resolverdir},' < %{SOURCE5} \ - > $RPM_BUILD_ROOT%{_mandir}/man1/%{stdname}q.1 + > %{buildroot}%{_mandir}/man1/%{name}q.1 # jaxp_transform_impl ghost symlink -ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar -# jaxp_parser_impl ghost symlink -#ln -s %{_sysconfdir}/alternatives \ -# $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +ln -sf %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %{buildroot}%{_javadir}/jaxp_transform_impl.jar %post update-alternatives --install %{_javadir}/jaxp_transform_impl.jar \ - jaxp_transform_impl %{_javadir}/%{stdname}.jar 25 + jaxp_transform_impl %{_javadir}/%{name}.jar 25 -%preun -{ - [ $1 -eq 0 ] || exit 0 - update-alternatives --remove jaxp_transform_impl %{_javadir}/%{stdname}.jar -} >/dev/null 2>&1 || : - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} +%postun +if [ $1 -eq 0 ] ; then + update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar +fi %files %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}.jar -%{_javadir}/%{stdname}-%{version}.jar -%ghost %{_javadir}/jaxp_transform_impl.jar +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/jaxp_transform_impl.jar +%ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar %files xpath %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}-xpath* +%{_javadir}/%{name}-xpath* %files xom %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}-xom* +%{_javadir}/%{name}-xom* %files sql %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}-sql* +%{_javadir}/%{name}-sql* %files jdom %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}-jdom* +%{_javadir}/%{name}-jdom* %files dom %defattr(0644,root,root,0755) -%{_javadir}/%{stdname}-dom* +%{_javadir}/%{name}-dom* %files manual %defattr(0644,root,root,0755) @@ -288,8 +248,7 @@ %files javadoc %defattr(0644,root,root,0755) -%ghost %doc %{_javadocdir}/%{name} -%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} %files demo %defattr(0644,root,root,0755) @@ -297,9 +256,9 @@ %files scripts %defattr(0755,root,root,0755) -%{_bindir}/%{stdname} -%{_bindir}/%{stdname}q -%attr(0644,root,root) %{_mandir}/man1/%{stdname}.1* -%attr(0644,root,root) %{_mandir}/man1/%{stdname}q.1* +%{_bindir}/%{name} +%{_bindir}/%{name}q +%attr(0644,root,root) %{_mandir}/man1/%{name}.1* +%attr(0644,root,root) %{_mandir}/man1/%{name}q.1* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org