SPECS: avalon-logkit.spec - added patch that allows to build with java 1.6

[pawelz]

Author: pawelz                       Date: Thu Oct 23 17:55:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added patch that allows to build with java 1.6

---- Files affected:
SPECS:
   avalon-logkit.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/avalon-logkit.spec
diff -u SPECS/avalon-logkit.spec:1.6 SPECS/avalon-logkit.spec:1.7
--- SPECS/avalon-logkit.spec:1.6	Sat Feb  9 22:00:47 2008
+++ SPECS/avalon-logkit.spec	Thu Oct 23 19:55:38 2008
@@ -1,10 +1,5 @@
 # $Revision$, $Date$
-# NOTE
-# - does not compile with java 1.6 due:
-#   LogKit-1.2/src/java/org/apache/log/output/db/DefaultDataSource.java:69:
-#   org.apache.log.output.db.DefaultDataSource is not abstract and does not
-#   override abstract method isWrapperFor(java.lang.Class) in java.sql.Wrapper
-# - http://java.sun.com/javase/6/docs/api/java/sql/Wrapper.html
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Java logging toolkit
 Summary(pl.UTF-8):	Biblioteka do logowania w Javie
@@ -18,6 +13,7 @@
 # Source0-md5:	17ede0a7d297ad610b47c476757c2b96
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-javadoc.patch
+Patch2:		%{name}-java16.patch
 URL:		http://avalon.apache.org/logkit/
 BuildRequires:	ant
 #BuildRequires:	avalon-framework >= 4.1.4
@@ -29,7 +25,7 @@
 BuildRequires:	logging-log4j
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
-BuildRequires:	jdk < 1.6
+BuildRequires:	jdk
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
@@ -67,6 +63,7 @@
 %setup -q -n LogKit-%{version}
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 required_jars="log4j mailapi jms servlet jdbc-stdext avalon-framework junit"
@@ -110,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008/10/23 17:55:38  pawelz
+- added patch that allows to build with java 1.6
+
 Revision 1.6  2008/02/09 21:00:47  qboosh
 - unified License format
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/avalon-logkit.spec?r1=1.6&r2=1.7&f=u