[xerces-j2] Fix OSGi requirements (remove 'system.bundle')

[Andrew Overholt]

commit 984153f2c2cafd2699e3e5c0978bd42c199c3c69
Author: Andrew Overholt <overholt at redhat.com>
Date:   Thu Mar 8 14:11:16 2012 -0500

    Fix OSGi requirements (remove 'system.bundle')
    
    Also, fold -scripts sub-package into main.

 xerces-j2-manifest.patch |    2 +-
 xerces-j2.spec           |   21 ++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
index d0c7c5a..64e0bca 100644
--- a/xerces-j2-manifest.patch
+++ b/xerces-j2-manifest.patch
@@ -10,7 +10,7 @@
 +Bundle-Localization: plugin
 +Bundle-Version: @impl.version@
 +Bundle-Vendor: Apache Software Foundation
-+Require-Bundle: system.bundle,javax.xml;bundle-version="[1.3.4,2.0.0)";visibility:=reexport,org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
++Require-Bundle: org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
 +Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version
 @",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerce
 s.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
  
  Name: org/apache/xerces/impl/Version.class
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 5bf46c0..d9ba7f5 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -2,7 +2,7 @@
 
 Name:          xerces-j2
 Version:       2.11.0
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Java XML parser
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -44,6 +44,8 @@ Requires:      xml-commons-apis >= 1.4.01
 Requires:      xml-commons-resolver >= 1.2
 
 Provides:      jaxp_parser_impl = 1.4
+Provides:      %{name}-scripts = %{version}-%{release}
+Obsoletes:     %{name}-scripts < 2.11.0-6
 
 Requires(post):  chkconfig jaxp_parser_impl
 Requires(preun): chkconfig jaxp_parser_impl
@@ -103,14 +105,6 @@ Requires:       %{name} = %{version}-%{release}
 %description    demo
 %{summary}.
 
-%package        scripts
-Summary:        Additional utility scripts for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    scripts
-%{summary}.
-
 %prep
 %setup -q -n xerces-%{cvs_version}
 %patch0 -p0 -b .orig
@@ -198,6 +192,7 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 %{_javadir}/%{name}*
+%{_bindir}/*
 %ghost %{_javadir}/jaxp_parser_impl.jar
 
 %files javadoc
@@ -210,11 +205,11 @@ update-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
 
-%files scripts
-%defattr(-,root,root,-)
-%{_bindir}/*
-
 %changelog
+* Thu Mar 08 2012 Andrew Overholt <overholt at redhat.com> - 2.11.0-6
+- Remove system.bundle OSGi requirement from MANIFEST.MF
+- Fold -scripts sub-package into main
+
 * Tue Mar 06 2012 Marek Goldmann <mgoldman at redhat.com> - 2.11.0-5
 - Use non-versioned jar name, RHBZ#800463
 - Cleanup in spec file to follow new guidelines