[java-sig-commits] [felix-bundlerepository] Add dependency on xpp3

[Mikolaj Izdebski]

commit 450dddcd7a11ae51d0fc4443c40418ea738a7571
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Apr 30 20:51:24 2012 +0200

    Add dependency on xpp3

 0001-Unbundle-libraries.patch  |    2 +-
 0002-Add-xpp3-dependency.patch |   29 +++++++++++++++++++++++++++++
 felix-bundlerepository.spec    |    9 +++++++--
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/0001-Unbundle-libraries.patch b/0001-Unbundle-libraries.patch
index c1e7ac4..359cac0 100644
--- a/0001-Unbundle-libraries.patch
+++ b/0001-Unbundle-libraries.patch
@@ -1,7 +1,7 @@
 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
+Subject: [PATCH 1/2] Unbundle libraries
 
 ---
  pom.xml |   11 +----------
diff --git a/0002-Add-xpp3-dependency.patch b/0002-Add-xpp3-dependency.patch
new file mode 100644
index 0000000..4022cce
--- /dev/null
+++ b/0002-Add-xpp3-dependency.patch
@@ -0,0 +1,29 @@
+From 6211e024938141fd3d6e63b2723a5cf241f06d29 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Mon, 30 Apr 2012 20:48:57 +0200
+Subject: [PATCH 2/2] Add xpp3 dependency
+
+---
+ pom.xml |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 6081935..2eece36 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -60,6 +60,12 @@
+       <optional>true</optional>
+     </dependency>
+     <dependency>
++      <groupId>xpp3</groupId>
++      <artifactId>xpp3</artifactId>
++      <version>1.1.3.4.O</version>
++      <optional>true</optional>
++    </dependency>
++    <dependency>
+         <groupId>org.osgi</groupId>
+         <artifactId>org.osgi.compendium</artifactId>
+         <version>4.0.0</version>
+-- 
+1.7.7.6
+
diff --git a/felix-bundlerepository.spec b/felix-bundlerepository.spec
index dd7b678..1a9ae45 100644
--- a/felix-bundlerepository.spec
+++ b/felix-bundlerepository.spec
@@ -10,7 +10,8 @@ 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
+Patch1:           0001-Unbundle-libraries.patch
+Patch2:           0002-Add-xpp3-dependency.patch
 
 BuildArch:        noarch
 
@@ -22,6 +23,7 @@ BuildRequires:    kxml
 BuildRequires:    maven
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    woodstox-core
+BuildRequires:    xpp3
 
 Requires:         java
 Requires:         jpackage-utils
@@ -29,6 +31,7 @@ Requires:         felix-shell
 Requires:         felix-utils
 Requires:         kxml
 Requires:         woodstox-core
+Requires:         xpp3
 
 
 %description
@@ -44,7 +47,8 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q -n %{site_name}-%{version}
-%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 mvn-rpmbuild install javadoc:aggregate
@@ -75,6 +79,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
+- Add dependency on xpp3
 - Include NOTICE in javadoc package
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.6-4