From 9e29e6313e6f12ef351e80e9a067fab2264bfa29 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Oct 18 2011 13:59:51 +0000
Subject: aqute-bndlib renamed to aqute-bnd (#745166)


- Fix compilation with openjdk 1.7.0
- Use new maven macros
- Packaging tweaks

---

diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 2dc9c70..c5d60fa 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     2.1
-Release:     5%{?dist}
+Release:     6%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 1.1
@@ -43,14 +43,12 @@ Source0:     http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{versi
 Source1:     http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version}/%{name}-%{version}.pom
 Patch0:      fix-java6-compile.patch
 Patch1:      avalon-logkit-pom-deps.patch
+Patch2:      avalon-logkit-encoding.patch
 Requires:    avalon-framework >= 0:4.1.4
 Requires:    servlet25
 Requires:    jms
 Requires:    jdbc-stdext
 
-Requires(post):    jpackage-utils
-Requires(postun):  jpackage-utils
-
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    ant
 BuildRequires:    javamail
@@ -58,7 +56,7 @@ BuildRequires:    ant-junit
 BuildRequires:    log4j
 BuildRequires:    avalon-framework >= 0:4.1.4
 # Required for converting jars to OSGi bundles
-BuildRequires:    aqute-bndlib
+BuildRequires:    aqute-bnd
 BuildRequires:    servlet25
 BuildRequires:    jms
 BuildRequires:    jdbc-stdext
@@ -85,15 +83,15 @@ Javadoc for %{name}.
 
 cp %{SOURCE1} pom.xml
 %patch1
-
+%patch2 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
 export CLASSPATH=%(build-classpath log4j javamail/mailapi jms tomcat6-servlet-2.5-api jdbc-stdext avalon-framework junit):$PWD/build/classes
-ant -Dnoget=true clean jar javadoc
+ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc
 # Convert to OSGi bundle
-java -jar %{_javadir}/aqute-bndlib.jar wrap target/%{name}-%{version}.jar
+java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
 
 %install
 # jars
@@ -103,11 +101,7 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
 install -m 644 target/%{name}-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-# compatibility depmaps
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{name}
-%add_to_maven_depmap org.apache.avalon.logkit %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -118,26 +112,24 @@ cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1-6
+- aqute-bndlib renamed to aqute-bnd (#745166)
+- Fix compilation with openjdk 1.7.0
+- Use new maven macros
+- Packaging tweaks
+
 * Fri May  6 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.1-5
 - Fix up depdenencies in pom