[jcommon/f18] Add proper Bundle-{Version, Name, SymbolicName} via bnd.properties file

jerboaa jerboaa at fedoraproject.org
Mon Sep 17 09:49:52 UTC 2012


commit 1442c6e6abd4b93318e63fbd9dc730da417336d9
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Sep 17 11:45:41 2012 +0200

    Add proper Bundle-{Version,Name,SymbolicName} via bnd.properties file

 bnd.properties |    3 +++
 jcommon.spec   |   10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/bnd.properties b/bnd.properties
new file mode 100644
index 0000000..1c5fcf6
--- /dev/null
+++ b/bnd.properties
@@ -0,0 +1,3 @@
+Bundle-Name= JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects. 
+Bundle-SymbolicName= org.jfree.jcommon
+Bundle-Version= ${jcommon.bundle.version}
\ No newline at end of file
diff --git a/jcommon.spec b/jcommon.spec
index 5afe8c2..2b314dd 100644
--- a/jcommon.spec
+++ b/jcommon.spec
@@ -1,10 +1,11 @@
 Name: jcommon
 Version: 1.0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: JFree Java utility classes
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://downloads.sourceforge.net/jfreechart/%{name}-%{version}.tar.gz
+Source2: bnd.properties
 URL: http://www.jfree.org/jcommon
 BuildRequires: ant, java-devel, jpackage-utils
 # Required for converting jars to OSGi bundles
@@ -43,7 +44,8 @@ pushd ant
 ant compile compile-xml javadoc
 popd
 # Convert to OSGi bundle
-java -jar $(build-classpath aqute-bnd) wrap %{name}-%{version}.jar
+java -Djcommon.bundle.version="%{version}" \
+     -jar $(build-classpath aqute-bnd) wrap -output %{name}-%{version}.bar -properties %{SOURCE2} %{name}-%{version}.jar
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
@@ -71,6 +73,10 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 17 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.0.17-5
+- Add proper Bundle-{Version,Name,SymbolicName} via
+  bnd.properties file
+
 * Tue Jul 24 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.0.17-4
 - Add aqute bnd instructions so as to produce OSGi metadata.
 


More information about the scm-commits mailing list