Attachment 609687 Details for Bug 854249 – Proposed fix

[patch] Proposed fix

osgi_metadata_fix.patch (text/plain), 1.78 KB, created by Severin Gehwolf on 2012-09-04 13:34:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2012-09-04 13:34:37 UTC

Size: 1.78 KB

patch

obsolete

>diff --git a/cglib.spec b/cglib.spec
>index 62ce924..d9ffdcf 100644
>--- a/cglib.spec
>+++ b/cglib.spec
>@@ -1,6 +1,6 @@
> Name:           cglib
> Version:        2.2
>-Release:        10%{?dist}
>+Release:        11%{?dist}
> Summary:        Code Generation Library for Java
> License:        ASL 2.0
> Group:          Development/Tools
>@@ -18,6 +18,7 @@ BuildRequires:  jpackage-utils >= 0:1.5
> BuildRequires:  java-devel >= 0:1.6.0
> BuildRequires:  objectweb-asm
> BuildRequires:  unzip
>+BuildRequires:  aqute-bnd
> BuildArch:      noarch
> Requires(post): jpackage-utils
> Requires(postun): jpackage-utils
>@@ -43,22 +44,23 @@ rm lib/*.jar
> %build
> export CLASSPATH=`build-classpath objectweb-asm`
> ant jar javadoc
>+# Convert to OSGi bundle
>+pushd dist
>+java -jar $(build-classpath aqute-bnd) wrap %{name}-%{version}.jar
>+popd
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> mkdir -p ${RPM_BUILD_ROOT}%{_javadocdir}/
> cp -r docs ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
>-cp -p dist/%{name}-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}
>+cp -p dist/%{name}-%{version}.bar  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
> ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
> cp %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> %add_to_maven_depmap net.sf.cglib %{name} %{version} JPP %{name}
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>-
> %post
> %update_maven_depmap
> 
>@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_javadocdir}/%{name}-%{version}
> 
> %changelog
>+* Tue Aug 14 2012 Severin Gehwolf <sgehwolf@redhat.com> 2.2-11
>+- Use aqute bnd in order to generate OSGi metadata.
>+
> * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 854249: 609687