[avalon-logkit] Another Java 7 fix.

[Alexander Kurtakov]

commit dc94f993d270d571552fc320c63add8ea3d26ac4
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Apr 18 00:52:05 2012 +0300

    Another Java 7 fix.
    
    - BR/R servlet 3.0 api.

 avalon-logkit.spec |   22 ++++++++++------------
 java7.patch        |    9 +++++++++
 2 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 3e8999a..677c3d8 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -33,7 +33,7 @@
 
 Name:        avalon-%{short_name}
 Version:     2.1
-Release:     7%{?dist}
+Release:     8%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 1.1
@@ -44,10 +44,10 @@ Source1:     http://repo1.maven.org/maven2/avalon-logkit/avalon-logkit/%{version
 Patch0:      fix-java6-compile.patch
 Patch1:      avalon-logkit-pom-deps.patch
 Patch2:      avalon-logkit-encoding.patch
+Patch3:      java7.patch
 Requires:    avalon-framework >= 0:4.1.4
-Requires:    servlet25
+Requires:    tomcat-servlet-3.0-api
 Requires:    jms
-Requires:    jdbc-stdext
 
 BuildRequires:    jpackage-utils >= 0:1.5
 BuildRequires:    ant
@@ -57,9 +57,8 @@ BuildRequires:    log4j
 BuildRequires:    avalon-framework >= 0:4.1.4
 # Required for converting jars to OSGi bundles
 BuildRequires:    aqute-bnd
-BuildRequires:    servlet25
+BuildRequires:    tomcat-servlet-3.0-api
 BuildRequires:    jms
-BuildRequires:    jdbc-stdext
 
 BuildArch:    noarch
 
@@ -84,11 +83,12 @@ Javadoc for %{name}.
 cp %{SOURCE1} pom.xml
 %patch1
 %patch2 -p1
+%patch3
 # 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
+export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
 ant -Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc
 # Convert to OSGi bundle
 java -jar $(build-classpath aqute-bnd) wrap target/%{name}-%{version}.jar
@@ -107,12 +107,6 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
 %files
 %doc LICENSE.txt NOTICE.txt
 %{_mavendepmapfragdir}/%{name}
@@ -124,6 +118,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Apr 18 2012 Alexander Kurtakov <akurtako at redhat.com> 0:2.1-8
+- Another Java 7 fix.
+- BR/R servlet 3.0 api.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/java7.patch b/java7.patch
new file mode 100644
index 0000000..0f28673
--- /dev/null
+++ b/java7.patch
@@ -0,0 +1,9 @@
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav	2012-04-18 00:41:59.000000000 +0300
++++ src/java/org/apache/log/output/db/DefaultDataSource.java	2012-04-18 00:46:17.454272754 +0300
+@@ -117,4 +117,6 @@ public class DefaultDataSource
+     }
+ 
+     public <T> T unwrap(java.lang.Class<T> iface) {return null;}
++    
++    public java.util.logging.Logger getParentLogger() {return null;}
+ }