From 602b6be099319357fa41d83614cfc1392ad56044 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Oct 18 2011 12:38:09 +0000
Subject: aqute-bndlib renamed to aqute-bnd (#745163)


- Use new maven macros
- Packaging tweaks

---

diff --git a/avalon-framework.spec b/avalon-framework.spec
index 4f51230..9d1ec73 100644
--- a/avalon-framework.spec
+++ b/avalon-framework.spec
@@ -55,16 +55,13 @@ Requires:    log4j
 Requires:    xalan-j2
 Requires:    xml-commons-apis
 
-Requires(post):    jpackage-utils
-Requires(postun):  jpackage-utils
-
 BuildRequires:    ant
 BuildRequires:	  ant-junit
 BuildRequires:	  apache-commons-logging
 BuildRequires:    avalon-logkit
 BuildRequires:    jpackage-utils
 # For converting jar into OSGi bundle
-BuildRequires:    aqute-bndlib
+BuildRequires:    aqute-bnd
 BuildRequires:    junit
 BuildRequires:	  log4j
 BuildRequires:    xml-commons-apis
@@ -107,7 +104,7 @@ 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
+java -jar $(build-classpath aqute-bnd) wrap target/%{name}-api-%{version}.jar
 
 # build implementation now
 pushd %{name}-impl-%{version}
@@ -115,7 +112,7 @@ pushd %{name}-impl-%{version}
 rm -rf src/test/*
 ant jar javadoc
 # Convert to OSGi bundle
-java -jar %{_javadir}/aqute-bndlib.jar wrap target/%{name}-impl-%{version}.jar
+java -jar $(build-classpath aqute-bnd) wrap target/%{name}-impl-%{version}.jar
 popd
 
 %install
@@ -127,8 +124,7 @@ mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api
 
 # pom file
 install -pm 644 %{name}-api-%{version}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-api.pom
-%add_to_maven_depmap %{name} %{name}-api %{version} JPP %{name}-api
-%add_to_maven_depmap org.apache.avalon.framework %{name}-api %{version} JPP %{name}-api
+%add_maven_depmap JPP-%{name}-api.pom %{name}-api.jar -a "org.apache.avalon.framework:%{name}-api"
 
 # javadocs
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api/
@@ -140,24 +136,15 @@ ln -sf %{_javadir}/%{name}-impl.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}.jar
 
 # pom file
 install -pm 644 %{name}-impl-%{version}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-impl.pom
-%add_to_maven_depmap %{name} %{name}-impl %{version} JPP %{name}-impl
-%add_to_maven_depmap org.apache.avalon.framework %{name}-impl %{version} JPP %{name}-impl
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}-impl
+%add_maven_depmap JPP-%{name}-impl.pom %{name}-impl.jar -a "org.apache.avalon.framework:%{name}-impl,%{name}:%{name}"
 
 # javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-impl
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-impl/
 popd
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %{_mavenpomdir}/JPP-%{name}-api.pom
 %{_mavenpomdir}/JPP-%{name}-impl.pom
@@ -167,11 +154,15 @@ popd
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:4.3-3
+- aqute-bndlib renamed to aqute-bnd (#745163)
+- Use new maven macros
+- Packaging tweaks
+
 * Tue May 3 2011 Severin Gehwolf <sgehwolf@redhat.com> 0:4.3-3
 - Convert jar's to OSGi bundles using aqute-bndlib.