From fcd90ceb9cb2f7003a181bf2488b286128620a48007c0fa6734a78e5c8f08976 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 16 Jan 2007 19:18:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xerces-j2?expand=0&rev=2 --- xerces-j2-bootstrap.spec | 4 +-- xerces-j2.changes | 5 +++ xerces-j2.spec | 75 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/xerces-j2-bootstrap.spec b/xerces-j2-bootstrap.spec index 2af20a5..162ddcf 100644 --- a/xerces-j2-bootstrap.spec +++ b/xerces-j2-bootstrap.spec @@ -1,7 +1,7 @@ # # spec file for package xerces-j2-bootstrap (Version 2.8.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -25,7 +25,7 @@ BuildRequires: update-alternatives Summary: Java XML parser Group: Development/Libraries/Java Version: 2.8.1 -Release: 17 +Release: 33 Requires: xml-commons-which-bootstrap Requires: xml-commons-apis-bootstrap Requires: xml-commons-resolver-bootstrap diff --git a/xerces-j2.changes b/xerces-j2.changes index 3aeaa8f..f1b5283 100644 --- a/xerces-j2.changes +++ b/xerces-j2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 16 18:29:04 CET 2007 - dbornkessel@suse.de + +- created sub-packages xml-apis and xml-resolver to avoid Bug #232127 + ------------------------------------------------------------------- Wed Nov 15 14:18:46 CET 2006 - dbornkessel@suse.de diff --git a/xerces-j2.spec b/xerces-j2.spec index ab5996d..9d778bc 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 (Version 2.8.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -18,7 +18,7 @@ BuildRequires: java2-devel-packages %define release 3jpp %define section free Version: 2.8.1 -Release: 14 +Release: 28 Summary: Java XML parser License: The Apache Software License URL: http://xml.apache.org/xerces2-j/ @@ -30,8 +30,6 @@ Source3: Xerces-J-tools.%{version}.tar.bz2 Patch0: %{name}-build.patch Patch1: java150_build.patch Provides: jaxp_parser_impl -Provides: xml-commons-apis -Provides: xml-commons-resolver PreReq: update-alternatives, /bin/ln # some build requirements removed to enable jpackage bootstrap. this is # the first package built, and we use the libraries in the tools subdir @@ -267,6 +265,42 @@ This package contains additional utility scripts for Xerces2. +%package xml-resolver +Summary: Resolver subproject of xml-commons +Group: Development/Libraries/Java +Requires: jpackage-utils >= 1.5 +Provides: xml-commons-resolver + +%description xml-resolver +xml-commons is focussed on common code and guidelines for xml projects. +The first focus will be to organize and have common packaging for the +various externally-defined standards code relating to XML - things like +the DOM, SAX, and JAXP interfaces. + +This package contains the resolver subproject of xml-commons. + + + +%package xml-apis +Summary: APIs subproject of xml-commons +Group: Development/Libraries/Java +Requires: jpackage-utils >= 1.5 +Provides: xml-commons-apis + +%description xml-apis +xml-commons is focused on common code and guidelines for xml projects. +It's first focus will be to organize and have common packaging for the +various externally-defined standards code relating to XML - things like +the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, +we also hope to serve as a holding area for other common xml-related +utilities and code, and to help promulgate common packaging, testing, +documentation, and other guidelines across all xml.apache.org +subprojects. + +This package contains the APIs subproject of xml-commons. + + + %prep %setup -q -n xerces-%{cvs_version} %setup -q -T -a 3 -D -n xerces-%{cvs_version} @@ -355,26 +389,51 @@ ln -s %{name}-xni-%{version} %{_javadocdir}/%{name}-xni %post /usr/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 -/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 -/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 /usr/sbin/update-alternatives --auto jaxp_parser_impl + +%post xml-apis +/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 /usr/sbin/update-alternatives --auto xml-commons-apis + +%post xml-resolver +/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 /usr/sbin/update-alternatives --auto xml-commons-resolver %preun { [ $1 = 0 ] || exit 0 /usr/sbin/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar +} >/dev/null 2>&1 || : + +%preun xml-apis +{ + [ $1 = 0 ] || exit 0 /usr/sbin/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar +} >/dev/null 2>&1 || : + +%preun xml-resolver +{ + [ $1 = 0 ] || exit 0 /usr/sbin/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar } >/dev/null 2>&1 || : %files %defattr(0644,root,root,0755) %doc LICENSE README ISSUES STATUS TODO -%{_javadir}/%{name}*.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}.jar %ghost %{_javadir}/jaxp_parser_impl.jar + +%files xml-apis +%defattr(0644,root,root,0755) +%{_javadir}/%{name}-%{version}-xml-apis.jar +%{_javadir}/%{name}-xml-apis.jar %ghost %{_javadir}/xml-commons-apis.jar + +%files xml-resolver +%defattr(0644,root,root,0755) +%{_javadir}/%{name}-%{version}-xml-resolver.jar +%{_javadir}/%{name}-xml-resolver.jar %ghost %{_javadir}/xml-commons-resolver.jar %files javadoc-impl @@ -411,6 +470,8 @@ ln -s %{name}-xni-%{version} %{_javadocdir}/%{name}-xni %{_bindir}/* %changelog -n xerces-j2 +* Tue Jan 16 2007 - dbornkessel@suse.de +- created sub-packages xml-apis and xml-resolver to avoid Bug #232127 * Wed Nov 15 2006 - dbornkessel@suse.de - Changed PreReq: /usr/sbin/update-alternatives