[jbosgi-repository] Fix OSGi metadata.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Aug 1 11:53:45 UTC 2012


commit 511ffaef38386be81f547d1d062c8603abe28915
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Aug 1 14:53:37 2012 +0300

    Fix OSGi metadata.

 fix_metadata.patch     |   11 +++++++++++
 jbosgi-repository.spec |    8 ++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/fix_metadata.patch b/fix_metadata.patch
new file mode 100644
index 0000000..1b08ab2
--- /dev/null
+++ b/fix_metadata.patch
@@ -0,0 +1,11 @@
+--- api/pom.xml.sav	2012-03-09 10:38:15.000000000 +0200
++++ api/pom.xml	2012-08-01 14:08:59.995436877 +0300
+@@ -55,7 +55,7 @@
+                         </Export-Package>
+                         <Import-Package>
+                             org.jboss.logging;version="[3.0,4.0)",
+-                            org.jboss.modules;version="[1.0,2.0);resolution:=optional",
++                            org.jboss.modules;version="[1.0,2.0)";resolution:=optional,
+                             org.jboss.osgi.metadata;version="[2.0,3.0)",
+                             org.osgi.framework;version="[1.5,2.0)",
+                         </Import-Package>
diff --git a/jbosgi-repository.spec b/jbosgi-repository.spec
index e988da8..3836547 100644
--- a/jbosgi-repository.spec
+++ b/jbosgi-repository.spec
@@ -3,7 +3,7 @@
 
 Name:             jbosgi-repository
 Version:          1.0.5
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          JBossOSGi Repository
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -17,6 +17,7 @@ Source0:          jbosgi-repository-%{namedversion}.tar.xz
 Patch0:           0001-Drop-osgi.enterprise-dependency.patch
 # We don't have test classes available to compile it
 Patch1:           0002-Disable-itests-module.patch
+Patch2:           fix_metadata.patch
 
 BuildArch:        noarch
 
@@ -70,6 +71,7 @@ find -name '*.dll' -exec rm -f '{}' \;
 
 %patch0 -p1
 %patch1 -p1
+%patch2
 
 %build
 # We need to use Maven3 explicitly because otherwise Maven2 classes are used...
@@ -118,6 +120,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 1 2012 Alexander Kurtakov <akurtako at redhat.com> 1.0.5-4
+- Fix OSGi metadata.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -127,4 +132,3 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 * Fri Jun 15 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.5-1
 - Initial packaging
-


More information about the scm-commits mailing list