From 2bb7bf3c5a747a0ade752fbe053c2770625ed341 Mon Sep 17 00:00:00 2001
From: Severin Gehwolf <sgehwolf@redhat.com>
Date: May 03 2011 19:24:57 +0000
Subject: - Convert jar's to OSGi bundles using aqute-bndlib.


---

diff --git a/avalon-framework.spec b/avalon-framework.spec
index 1f4ba43..4f51230 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     4.3
-Release:     2%{?dist}
+Release:     3%{?dist}
 Epoch:       0
 Summary:     Java components interfaces
 License:     ASL 2.0
@@ -63,6 +63,8 @@ BuildRequires:	  ant-junit
 BuildRequires:	  apache-commons-logging
 BuildRequires:    avalon-logkit
 BuildRequires:    jpackage-utils
+# For converting jar into OSGi bundle
+BuildRequires:    aqute-bndlib
 BuildRequires:    junit
 BuildRequires:	  log4j
 BuildRequires:    xml-commons-apis
@@ -104,19 +106,23 @@ popd
 export CLASSPATH=%(build-classpath avalon-logkit junit commons-logging log4j)
 export CLASSPATH="$CLASSPATH:../target/%{name}-api-%{version}.jar"
 ant jar test javadoc
+# Convert to OSGi bundle
+java -jar %{_javadir}/aqute-bndlib.jar wrap target/%{name}-api-%{version}.jar
 
 # build implementation now
 pushd %{name}-impl-%{version}
 # tests removed because we don't have jmock
 rm -rf src/test/*
 ant jar javadoc
+# Convert to OSGi bundle
+java -jar %{_javadir}/aqute-bndlib.jar wrap target/%{name}-impl-%{version}.jar
 popd
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/
 install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
 
-install -m 644 target/%{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
+install -m 644 target/%{name}-api-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api
 
 # pom file
@@ -129,7 +135,7 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api/
 
 
 pushd %{name}-impl-%{version}
-install -m 644 target/%{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar
+install -m 644 target/%{name}-impl-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar
 ln -sf %{_javadir}/%{name}-impl.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}.jar
 
 # pom file
@@ -166,6 +172,9 @@ popd
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue May 3 2011 Severin Gehwolf <sgehwolf@redhat.com> 0:4.3-3
+- Convert jar's to OSGi bundles using aqute-bndlib.
+
 * Tue May  3 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.3-2
 - Add compatibility depmap for org.apache.avalon.framework groupId