[java-sig-commits] [felix-bundlerepository] Unbundle libraries

[Mikolaj Izdebski]

commit c1d1cd74f5bde67f0868aa01d606cdf96bc4447d
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Apr 30 20:41:05 2012 +0200

    Unbundle libraries

 0001-Unbundle-libraries.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 felix-bundlerepository.spec   |   17 +++++++++++------
 2 files changed, 52 insertions(+), 6 deletions(-)
---
diff --git a/0001-Unbundle-libraries.patch b/0001-Unbundle-libraries.patch
new file mode 100644
index 0000000..c1e7ac4
--- /dev/null
+++ b/0001-Unbundle-libraries.patch
@@ -0,0 +1,41 @@
+From f2f391e2ab3f289657ada944327200025df74073 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Mon, 30 Apr 2012 20:25:01 +0200
+Subject: [PATCH] Unbundle libraries
+
+---
+ pom.xml |   11 +----------
+ 1 files changed, 1 insertions(+), 10 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 19831ee..6081935 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -58,12 +58,6 @@
+       <artifactId>kxml2</artifactId>
+       <version>2.3.0</version>
+       <optional>true</optional>
+-      <exclusions>
+-        <exclusion>
+-          <groupId>xmlpull</groupId>
+-          <artifactId>xmlpull</artifactId>
+-        </exclusion>
+-      </exclusions>
+     </dependency>
+     <dependency>
+         <groupId>org.osgi</groupId>
+@@ -99,10 +93,7 @@
+           <instructions>
+             <Export-Package>org.apache.felix.bundlerepository;version="2.0"</Export-Package>
+             <Private-Package>
+-                org.kxml2.io,
+-                org.xmlpull.v1,
+-                org.apache.felix.bundlerepository.impl.*,
+-                org.apache.felix.utils.*
++                org.apache.felix.bundlerepository.impl.*
+             </Private-Package>
+             <Import-Package>!javax.xml.parsers,!org.xml.sax,org.osgi.service.log;resolution:=optional,org.osgi.service.obr;resolution:=optional,javax.xml.stream;resolution:=optional,*</Import-Package>
+             <DynamicImport-Package>org.apache.felix.shell</DynamicImport-Package>
+-- 
+1.7.7.6
+
diff --git a/felix-bundlerepository.spec b/felix-bundlerepository.spec
index 05eac84..dd7b678 100644
--- a/felix-bundlerepository.spec
+++ b/felix-bundlerepository.spec
@@ -10,22 +10,25 @@ Group:            Development/Libraries
 URL:              http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
 
 Source0:          http://www.fightrice.com/mirrors/apache/felix/org.apache.felix.bundlerepository-%{version}-source-release.tar.gz
+Patch0:           0001-Unbundle-libraries.patch
 
 BuildArch:        noarch
 
-BuildRequires:    woodstox-core
+BuildRequires:    java-devel
+BuildRequires:    jpackage-utils
 BuildRequires:    felix-shell
 BuildRequires:    felix-utils
-BuildRequires:    java-devel
+BuildRequires:    kxml
 BuildRequires:    maven
 BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    jpackage-utils
+BuildRequires:    woodstox-core
 
-Requires:         woodstox-core
+Requires:         java
+Requires:         jpackage-utils
 Requires:         felix-shell
 Requires:         felix-utils
-Requires:         jpackage-utils
-Requires:         java
+Requires:         kxml
+Requires:         woodstox-core
 
 
 %description
@@ -41,6 +44,7 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{site_name}-%{version}
+%patch0 -p1
 
 %build
 mvn-rpmbuild install javadoc:aggregate
@@ -70,6 +74,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %changelog
 * Mon Apr 30 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6.6-5
+- Unbundle libraries
 - Include NOTICE in javadoc package
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-4