[java-sig-commits] [felix-bundlerepository] Make felix-utils mandatory dep in pom.xml

[Stanislav Ochotnicky]

commit b5fe3dd6eae4e52b40917d3109cf47f36a013949
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon May 21 14:16:29 2012 +0200

    Make felix-utils mandatory dep in pom.xml

 0003-Make-felix-utils-mandatory-dep.patch |   24 ++++++++++++++++++++++++
 felix-bundlerepository.spec               |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0003-Make-felix-utils-mandatory-dep.patch b/0003-Make-felix-utils-mandatory-dep.patch
new file mode 100644
index 0000000..088b45c
--- /dev/null
+++ b/0003-Make-felix-utils-mandatory-dep.patch
@@ -0,0 +1,24 @@
+From d4224eb72994300fb2602d5f06a509a9ad539394 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Mon, 21 May 2012 14:15:05 +0200
+Subject: [PATCH 3/3] Make felix utils mandatory dep
+
+---
+ pom.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 2eece36..bdcb5d8 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -39,7 +39,6 @@
+       <groupId>${project.groupId}</groupId>
+       <artifactId>org.apache.felix.utils</artifactId>
+       <version>1.1.0</version>
+-      <optional>true</optional>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+-- 
+1.7.7.6
+
diff --git a/felix-bundlerepository.spec b/felix-bundlerepository.spec
index 9fc80e0..bf85d31 100644
--- a/felix-bundlerepository.spec
+++ b/felix-bundlerepository.spec
@@ -3,7 +3,7 @@
 
 Name:             felix-bundlerepository
 Version:          1.6.6
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Bundle repository service
 License:          ASL 2.0 and BSD
 Group:            Development/Libraries
@@ -12,6 +12,7 @@ URL:              http://felix.apache.org/site/apache-felix-osgi-bundle-reposito
 Source0:          http://www.fightrice.com/mirrors/apache/felix/org.apache.felix.bundlerepository-%{version}-source-release.tar.gz
 Patch1:           0001-Unbundle-libraries.patch
 Patch2:           0002-Add-xpp3-dependency.patch
+Patch3:           0003-Make-felix-utils-mandatory-dep.patch
 
 BuildArch:        noarch
 
@@ -49,6 +50,7 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{site_name}-%{version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 mvn-rpmbuild package javadoc:aggregate
@@ -77,6 +79,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon May 21 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.6.6-6
+- Make felix-utils mandatory dep in pom.xml
+
 * Mon Apr 30 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.6.6-5
 - Unbundle libraries
 - Add dependency on xpp3