Attachment 600034 Details for Bug 842744 – Patch with a proposed fix

[patch] Patch with a proposed fix

jfreechart_osgi.patch (text/plain), 1.94 KB, created by Severin Gehwolf on 2012-07-24 13:59:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2012-07-24 13:59:02 UTC

Size: 1.94 KB

patch

obsolete

>diff --git a/jfreechart.spec b/jfreechart.spec
>index 7172dcd..b2e4fb5 100644
>--- a/jfreechart.spec
>+++ b/jfreechart.spec
>@@ -2,7 +2,7 @@
> 
> Name:           jfreechart
> Version:        1.0.14
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        Java chart library
> 
> Group:          Development/Libraries
>@@ -13,6 +13,8 @@ Source0:        http://download.sourceforge.net/sourceforge/jfreechart/%{name}-%
> Requires:       servlet java jpackage-utils
> Requires:       jcommon >= 1.0.17
> BuildRequires:  %{requires} ant java-devel eclipse-swt servlet
>+# Required for converting jars to OSGi bundles
>+BuildRequires:  aqute-bnd
> 
> BuildArch:      noarch
> 
>@@ -55,7 +57,8 @@ ant -f ant/build-swt.xml \
>         -Dswt.jar=%{_libdir}/java/swt.jar \
>         -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
> 
> %install
> # Directory structure
>@@ -64,7 +67,7 @@ install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> install -d $RPM_BUILD_ROOT%{_mavenpomdir}
> 
> # JARs and JavaDoc
>-install -m 644 lib/jfreechart-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
>+install -m 644 lib/jfreechart-%{version}.bar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}.jar
> install -m 644 lib/swtgraphics2d.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/swtgraphics2d.jar
> install -m 644 lib/jfreechart-%{version}-swt.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-swt.jar
> cp -rp javadoc/. $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>@@ -90,6 +93,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}.pom
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Jul 24 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.0.14-2
>+- Add aqute bnd instructions so as to produce OSGi metadata.
>+
> * Mon Apr 23 2012 Alexander Kurtakov <akurtako@redhat.com> 1.0.14-1
> - Update to new upstream version 1.0.14.
> - Use pom.xml file from the tarball.

Actions: View | Diff

Attachments on bug 842744: 600034