Attachment 600033 Details for Bug 842740 – Patch with fix

[patch] Patch with fix

jcommon_osgi.patch (text/plain), 1.53 KB, created by Severin Gehwolf on 2012-07-24 13:46:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2012-07-24 13:46:53 UTC

Size: 1.53 KB

patch

obsolete

>diff --git a/jcommon.spec b/jcommon.spec
>index f4157a4..5afe8c2 100644
>--- a/jcommon.spec
>+++ b/jcommon.spec
>@@ -1,12 +1,14 @@
> Name: jcommon
> Version: 1.0.17
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> Summary: JFree Java utility classes
> License: LGPLv2+
> Group: System Environment/Libraries
> Source: http://downloads.sourceforge.net/jfreechart/%{name}-%{version}.tar.gz
> URL: http://www.jfree.org/jcommon
> BuildRequires: ant, java-devel, jpackage-utils
>+# Required for converting jars to OSGi bundles
>+BuildRequires:  aqute-bnd
> Requires: java, jpackage-utils
> BuildArch: noarch
> 
>@@ -37,12 +39,15 @@ Optional XML utility classes.
> find . -name "*.jar" -exec rm -f {} \;
> 
> %build
>-cd ant
>+pushd ant
> ant compile compile-xml javadoc
>+popd
>+# Convert to OSGi bundle
>+java -jar $(build-classpath aqute-bnd) wrap %{name}-%{version}.jar
> 
> %install
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+cp -p %{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> cp -p %{name}-xml-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xml.jar
> 
> mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>@@ -66,6 +71,9 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Tue Jul 24 2012 Severin Gehwolf <sgehwolf@redhat.com> 1.0.17-4
>+- Add aqute bnd instructions so as to produce OSGi metadata.
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.17-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 842740: 600033