[jfreechart/f18] Set proper Bundle-{Version, SymbolicName, Name} in manifest.

jerboaa jerboaa at fedoraproject.org
Mon Sep 17 12:12:53 UTC 2012


commit a3758bd1fcbf02b4434ea7402ec9afc80543f3f8
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Mon Sep 17 14:11:03 2012 +0200

    Set proper Bundle-{Version,SymbolicName,Name} in manifest.

 bnd.properties  |    3 +++
 jfreechart.spec |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/bnd.properties b/bnd.properties
new file mode 100644
index 0000000..a547a17
--- /dev/null
+++ b/bnd.properties
@@ -0,0 +1,3 @@
+Bundle-Name= JFreeChart is a free 100% Java chart library 
+Bundle-SymbolicName= org.jfree.jfreechart
+Bundle-Version= ${jfreechart.bundle.version}
\ No newline at end of file
diff --git a/jfreechart.spec b/jfreechart.spec
index 2503ba1..c1c766e 100644
--- a/jfreechart.spec
+++ b/jfreechart.spec
@@ -2,13 +2,14 @@
 
 Name:           jfreechart
 Version:        1.0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java chart library
 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://www.jfree.org/jfreechart/
 Source0:        http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%{version}.tar.gz
+Source1:        bnd.properties
 
 Requires:       servlet java jpackage-utils
 Requires:       jcommon >= 1.0.17
@@ -58,7 +59,8 @@ ant -f ant/build-swt.xml \
         -Djcommon.jar=$(build-classpath jcommon) \
         -Djfreechart.jar=lib/jfreechart-%{version}.jar
 # Convert to OSGi bundle
-java -jar $(build-classpath aqute-bnd) wrap lib/%{name}-%{version}.jar
+java -Djfreechart.bundle.version="%{version}" -jar $(build-classpath aqute-bnd) \
+   wrap -output lib/%{name}-%{version}.bar -properties %{SOURCE1} lib/%{name}-%{version}.jar
 
 %install
 # Directory structure
@@ -93,6 +95,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Sep 17 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.0.14-4
+- Set proper Bundle-{Version,SymbolicName,Name} in manifest.
+
 * Tue Jul 24 2012 Severin Gehwolf <sgehwolf at redhat.com> 1.0.14-3
 - Add aqute bnd instructions so as to produce OSGi metadata.
 - Based on kdaniel's suggestion, use build-classpath script to find swt


More information about the scm-commits mailing list