Hello community, here is the log from the commit of package saxon6 for openSUSE:Factory checked in at 2020-11-19 16:46:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/saxon6 (Old) and /work/SRC/openSUSE:Factory/.saxon6.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "saxon6" Thu Nov 19 16:46:39 2020 rev:12 rq:849419 version:6.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/saxon6/saxon6.changes 2017-09-20 17:09:35.579721128 +0200 +++ /work/SRC/openSUSE:Factory/.saxon6.new.5913/saxon6.changes 2020-11-23 10:49:46.126558963 +0100 @@ -1,0 +2,11 @@ +Thu Nov 19 06:37:45 UTC 2020 - Fridrich Strba <fst...@suse.com> + +- Add the maven metadata in order to be usable in maven build + +------------------------------------------------------------------- +Wed Nov 18 04:25:55 UTC 2020 - Anton Shvetz <t...@sectorb.msk.ru> + +- Remove "fop" subpackage because it provides an empty JAR. + Source files do not contain any FOP support. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ saxon6.spec ++++++ --- /var/tmp/diff_new_pack.cG83Fs/_old 2020-11-23 10:49:46.758559596 +0100 +++ /var/tmp/diff_new_pack.cG83Fs/_new 2020-11-23 10:49:46.762559599 +0100 @@ -1,7 +1,7 @@ # # spec file for package saxon6 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Summary: The SAXON XSLT Processor from Michael Kay License: MPL-1.0 Group: Productivity/Publishing/XML -Url: http://saxon.sourceforge.net/ +URL: http://saxon.sourceforge.net/ Source0: http://download.sf.net/saxon/saxon6-5-5.zip Source1: %{name}.saxon.script Source2: %{name}.build.script @@ -41,9 +41,8 @@ Patch5: saxon6-batch.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: fop >= 0.20.1 BuildRequires: java-devel -BuildRequires: javapackages-tools +BuildRequires: javapackages-local BuildRequires: jdom >= 1.0 BuildRequires: unzip BuildRequires: xml-commons-apis @@ -51,6 +50,7 @@ Requires: jaxp_parser_impl Provides: jaxp_transform_impl = %{name}-%{version} Provides: saxon +Obsoletes: %{name}-fop BuildArch: noarch %description @@ -110,16 +110,6 @@ %description demo Demonstrations and samples for %{name}. -%package fop -Summary: FOP support for %{name} -Group: Productivity/Publishing/XML -Requires: %{name} = %{version}-%{release} -Requires: fop >= 0.20.1 -Provides: saxon-fop - -%description fop -FOP support for %{name}. - %package jdom Summary: JDOM support for %{name} Group: Productivity/Publishing/XML @@ -155,20 +145,21 @@ %build # fixes the javadoc fail export LC_ALL=en_US.ISO-8859-2 -export CLASSPATH=%(build-classpath xml-commons-apis xmlgraphics-fop jdom) +export CLASSPATH=%(build-classpath xml-commons-apis jdom) ant \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dj2se.javadoc=%{_javadocdir}/java \ - -Dfop.javadoc=%{_javadocdir}/fop \ -Djdom.javadoc=%{_javadocdir}/jdom %install # jars mkdir -p %{buildroot}%{_javadir} cp -p build/lib/saxon.jar %{buildroot}%{_javadir}/%{name}.jar +%add_maven_depmap saxon:saxon:%{version} %{name}.jar cp -p build/lib/saxon-aelfred.jar %{buildroot}%{_javadir}/%{name}-aelfred.jar -cp -p build/lib/saxon-fop.jar %{buildroot}%{_javadir}/%{name}-fop.jar +%add_maven_depmap saxon:saxon-aelfred:%{version} %{name}-aelfred.jar -f aelfred cp -p build/lib/saxon-jdom.jar %{buildroot}%{_javadir}/%{name}-jdom.jar +%add_maven_depmap saxon:saxon-jdom:%{version} %{name}-jdom.jar -f jdom # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} @@ -203,20 +194,14 @@ update-alternatives --remove jaxp_transform_impl %{_javadir}/%{name}.jar fi -%files -%{_javadir}/%{name}.jar +%files -f .mfiles %{_javadir}/%{name}.jar %{_javadir}/jaxp_transform_impl.jar %ghost %{_sysconfdir}/alternatives/jaxp_transform_impl.jar -%files aelfred -%{_javadir}/%{name}-aelfred* - -%files fop -%{_javadir}/%{name}-fop* +%files aelfred -f .mfiles-aelfred -%files jdom -%{_javadir}/%{name}-jdom* +%files jdom -f .mfiles-jdom %files manual %doc doc/*.html _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
