Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at 2013-06-05 13:24:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xml-commons (Old) and /work/SRC/openSUSE:Factory/.xml-commons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xml-commons" Changes: -------- --- /work/SRC/openSUSE:Factory/xml-commons/xml-commons.changes 2011-09-23 12:51:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xml-commons.new/xml-commons.changes 2013-06-05 13:24:44.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 18 09:05:14 UTC 2013 - [email protected] + +- install xml-commons-resolver as master alternative (bnc#814196) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.QMbukh/_old 2013-06-05 13:24:45.000000000 +0200 +++ /var/tmp/diff_new_pack.QMbukh/_new 2013-06-05 13:24:45.000000000 +0200 @@ -1,7 +1,8 @@ +# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: # # spec file for package xml-commons-apis-bootstrap # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,7 +16,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define xml_commons_version 1.0.b2 %define real_name xml-commons @@ -25,10 +25,10 @@ Name: xml-commons-apis-bootstrap Version: 1.3.04 -Release: 3 +Release: 0 Summary: Common code for XML projects - bootstrapping package -Group: Development/Libraries/Java License: Apache-2.0 +Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-1_0_b2/ Source0: xml-commons-1.0.b2.tar.bz2 @@ -49,15 +49,14 @@ BuildRequires: antlr-bootstrap BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel -BuildRequires: update-alternatives BuildRequires: fastjar +BuildRequires: update-alternatives %description This is xml-apis from the java-bootrapping-tools package. DO NOT INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! %package -n xml-commons-which-bootstrap -License: Apache-2.0 Summary: Which subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ @@ -67,7 +66,6 @@ INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! %package -n xml-commons-resolver-bootstrap -License: Apache-2.0 Summary: Resolver subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ @@ -221,6 +219,5 @@ %doc xml-commons-1_0_b2/LICENSE.txt %{_javadir}/%{resolver_jar}.jar #<<< -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: %changelog ++++++ xml-commons.spec ++++++ --- /var/tmp/diff_new_pack.QMbukh/_old 2013-06-05 13:24:45.000000000 +0200 +++ /var/tmp/diff_new_pack.QMbukh/_new 2013-06-05 13:24:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xml-commons # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -17,7 +17,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild # FIXME: workaround for bnc#650905 %define with_repolib 0 @@ -40,10 +39,10 @@ Name: xml-commons Version: 1.3.04 -Release: 7 +Release: 0 Summary: Common code for XML projects -Group: Development/Libraries/Java License: Apache-2.0 +Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ # svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-1_0_b2/ Source0: xml-commons-1.0.b2.tar.bz2 @@ -105,17 +104,16 @@ guidelines across all xml.apache.org subprojects. %package jaxp-1.1-apis -License: Apache-2.0 Summary: JAXP 1.1, DOM2, SAX2, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML -Provides: jaxp = 1.1 Provides: dom = 2 +Provides: jaxp = 1.1 Provides: sax = 2.0 -Provides: xslt = 1.0 Provides: xml-commons-apis = %{apis_version_1_1}-%{release} +Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02-2jpp -Requires: jpackage-utils >= 1.6 Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils >= 1.6 Requires(preun): update-alternatives Requires(post): update-alternatives @@ -126,9 +124,8 @@ Processing 1.1, i.e. javax.xml{.parsers,.transform} %package jaxp-1.1-apis-javadoc -License: Apache-2.0 -Group: Productivity/Publishing/XML Summary: Javadoc for %{name}-jaxp-1.1-apis +Group: Productivity/Publishing/XML Provides: %{name}-apis-javadoc = %{apis_version_1_1}-%{release} %description jaxp-1.1-apis-javadoc @@ -136,24 +133,22 @@ %{summary}. %package jaxp-1.1-apis-manual -License: Apache-2.0 -Group: Development/Documentation Summary: Documents for %{name}-jaxp-1.1-apis +Group: Development/Documentation %description jaxp-1.1-apis-manual %{summary}. %package which10 -License: Apache-2.0 Summary: XmlWhich 1.0 utility from %{name} Group: Productivity/Publishing/XML Provides: xml-commons-which = 1.0 -Requires: jpackage-utils >= 1.6 -Requires: jaxp_parser_impl -Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} Requires: %{name} = %{version}-%{release} Requires: ant >= 1.6 +Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.6 +Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} Requires(preun): update-alternatives Requires(post): update-alternatives @@ -162,7 +157,6 @@ %{name}. %package which10-javadoc -License: Apache-2.0 Summary: Javadoc for %{name}-which10 Group: Development/Documentation @@ -170,14 +164,13 @@ Javadoc for %{name}-which. %package resolver10 -License: Apache-2.0 Summary: XmlResolver 1.0 utility from %{name} Group: Development/Java Provides: xml-commons-resolver = 1.0 -Requires: jpackage-utils >= 1.6 +Requires: %{name} = %{version}-%{release} Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.6 Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} -Requires: %{name} = %{version}-%{release} Requires(preun):update-alternatives Requires(post): update-alternatives @@ -191,7 +184,6 @@ %package resolver10-javadoc - Summary: Javadoc for %{name}-resolver10 Group: Development/Documentation @@ -201,14 +193,13 @@ %endif %package resolver11 -License: Apache-2.0 Summary: XmlResolver 1.1 utility from %{name} Group: Development/Java Provides: xml-commons-resolver = 1.1 -Requires: jpackage-utils >= 1.6 +Requires: %{name} = %{version}-%{release} Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.6 Requires: xml-commons-jaxp-1.2-apis = %{version}-%{release} -Requires: %{name} = %{version}-%{release} Provides: xml-commons-resolver = %{version}-%{release} Obsoletes: xml-commons-resolver <= 1.3.02 Requires(preun): update-alternatives @@ -224,7 +215,6 @@ %package resolver11-javadoc - Summary: Javadoc for %{name}-resolver11 Group: Development/Documentation Provides: xml-commons-resolver-javadoc = %{version}-%{release} @@ -236,17 +226,16 @@ %endif %package jaxp-1.2-apis -License: Apache-2.0 Summary: JAXP 1.2, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML -Provides: jaxp = 1.2 Provides: dom = 2 +Provides: jaxp = 1.2 Provides: sax = 2.0.1 -Provides: xslt = 1.0 Provides: xml-commons-apis = %{apis_version_1_2}-%{release} +Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02-2jpp -Requires: jpackage-utils >= 1.6 Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils >= 1.6 Requires(preun): update-alternatives Requires(post): update-alternatives @@ -257,9 +246,8 @@ Processing 1.2, i.e. javax.xml{.parsers,.transform} %package jaxp-1.2-apis-javadoc -License: Apache-2.0 -Group: Development/Documentation Summary: Javadoc for %{name}-jaxp-1.2-apis +Group: Development/Documentation Provides: %{name}-apis-javadoc = %{apis_version_1_2}-%{release} %description jaxp-1.2-apis-javadoc @@ -267,26 +255,24 @@ %{summary}. %package jaxp-1.2-apis-manual -License: Apache-2.0 -Group: Development/Documentation Summary: Documents for %{name}-jaxp-1.2-apis +Group: Development/Documentation %description jaxp-1.2-apis-manual %{summary}. %package jaxp-1.3-apis -License: Apache-2.0 Summary: JAXP 1.3, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis Group: Productivity/Publishing/XML -Provides: jaxp = 1.3 Provides: dom = 3 +Provides: jaxp = 1.3 Provides: sax = 2.0.2 -Provides: xslt = 1.0 Provides: xml-commons-apis = %{version}-%{release} +Provides: xslt = 1.0 Obsoletes: xml-commons-apis <= 1.3.02 -Requires: jpackage-utils >= 1.6 Requires: %{name} = %{version}-%{release} +Requires: jpackage-utils >= 1.6 Requires(preun): update-alternatives Requires(post): update-alternatives @@ -298,9 +284,8 @@ javax.xml{.parsers,.transform,.validation,.datatype,.xtype}. %package jaxp-1.3-apis-javadoc -License: Apache-2.0 -Group: Development/Documentation Summary: Javadoc for %{name}-jaxp-1.3-apis +Group: Development/Documentation Provides: %{name}-apis-javadoc = %{version}-%{release} Obsoletes: xml-comons-apis-javadoc <= 1.3.02 @@ -309,9 +294,8 @@ %{summary}. %package jaxp-1.3-apis-manual -License: Apache-2.0 -Group: Development/Documentation Summary: Documents for %{name}-jaxp-1.3-apis +Group: Development/Documentation Provides: xml-comons-apis-manual = %{version}-%{release} Obsoletes: xml-comons-apis-manual <= 1.3.02 @@ -320,17 +304,16 @@ %{summary}. %package which11 -License: Apache-2.0 -Group: Productivity/Publishing/XML Summary: XmlWhich 1.1 from %{name} +Group: Productivity/Publishing/XML #Provides: xml-commons-which = 1.1 Provides: xml-commons-which = %{version}-%{release} Obsoletes: xml-commons-which <= 1.3.02 -Requires: jpackage-utils >= 1.6 +Requires: %{name} = %{version}-%{release} +Requires: ant >= 1.6 Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.6 Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} -Requires: ant >= 1.6 -Requires: %{name} = %{version}-%{release} Requires(preun): update-alternatives Requires(post): update-alternatives @@ -339,9 +322,8 @@ %{summary}. %package which11-javadoc -License: Apache-2.0 -Group: Development/Documentation Summary: Javadoc for %{name}-which11 +Group: Development/Documentation Provides: xml-commons-which-javadoc = %{version}-%{release} Obsoletes: xml-commons-which-javadoc <= 1.3.02 @@ -350,13 +332,12 @@ %{summary}. %package resolver12 -License: Apache-2.0 -Group: Productivity/Publishing/XML Summary: XmlResolver 1.2 from %{name} +Group: Productivity/Publishing/XML Provides: xml-commons-resolver = 1.2 -Requires: jpackage-utils >= 1.6 Requires: %{name} = %{version}-%{release} Requires: jaxp_parser_impl +Requires: jpackage-utils >= 1.6 Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} Requires(preun): update-alternatives Requires(post): update-alternatives @@ -366,9 +347,8 @@ %{summary}. %package resolver12-javadoc -License: Apache-2.0 -Group: Development/Documentation Summary: Javadoc for %{name}-resolver12 +Group: Development/Documentation %description resolver12-javadoc @@ -378,7 +358,6 @@ %package repolib - Summary: Artifacts to be uploaded to a repository library Group: Development/Libraries/Java @@ -727,30 +706,32 @@ %post resolver10 %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver10 10000 \ ---slave %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread10 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse10 \ --slave %{_mandir}/man1/xml-resolver.1.bz2 xml-resolver.1.bz2 %{_mandir}/man1/xml-resolver10.1.bz2 \ --slave %{_mandir}/man1/xml-xread.1.bz2 xml-xread.1.bz2 %{_mandir}/man1/xml-xread10.1.bz2 \ --slave %{_mandir}/man1/xml-xparse.1.bz2 xml-xparse.1.bz2 %{_mandir}/man1/xml-xparse10.1.bz2 +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar 10000 %postun resolver10 if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver10 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar fi %post resolver11 %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver11 10100 \ ---slave %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread11 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse11 \ --slave %{_mandir}/man1/xml-resolver.1.bz2 xml-resolver.1.bz2 %{_mandir}/man1/xml-resolver11.1.bz2 \ --slave %{_mandir}/man1/xml-xread.1.bz2 xml-xread.1.bz2 %{_mandir}/man1/xml-xread11.1.bz2 \ --slave %{_mandir}/man1/xml-xparse.1.bz2 xml-xparse.1.bz2 %{_mandir}/man1/xml-xparse11.1.bz2 +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar 10100 %postun resolver11 if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver11 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar fi %post jaxp-1.2-apis @@ -827,16 +808,17 @@ %post resolver12 %{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver12 10200 \ ---slave %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar \ --slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread12 \ --slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse12 \ --slave %{_mandir}/man1/xml-resolver.1.bz2 xml-resolver.1.bz2 %{_mandir}/man1/xml-resolver12.1.bz2 \ --slave %{_mandir}/man1/xml-xread.1.bz2 xml-xread.1.bz2 %{_mandir}/man1/xml-xread12.1.bz2 \ --slave %{_mandir}/man1/xml-xparse.1.bz2 xml-xparse.1.bz2 %{_mandir}/man1/xml-xparse12.1.bz2 +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar 10200 %postun resolver12 if [ "$1" = "0" ]; then %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver12 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar fi # ----------------------------------------------------------------------------- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
