SPECS: avalon-logkit.spec - builds with jdk 1.5 (just -target won'...

[glen]

Author: glen                         Date: Sun Dec  2 13:50:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- builds with jdk 1.5 (just -target won't do)

---- Files affected:
SPECS:
   avalon-logkit.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/avalon-logkit.spec
diff -u SPECS/avalon-logkit.spec:1.2 SPECS/avalon-logkit.spec:1.3
--- SPECS/avalon-logkit.spec:1.2	Sun Dec  2 14:44:05 2007
+++ SPECS/avalon-logkit.spec	Sun Dec  2 14:49:56 2007
@@ -1,9 +1,14 @@
 # $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
 %include	/usr/lib/rpm/macros.java
 Summary:	Java logging toolkit
 Name:		avalon-logkit
 Version:	1.2
-Release:	0.1
+Release:	1
 Epoch:		0
 License:	Apache Software License
 Group:		Development/Languages/Java
@@ -22,6 +27,7 @@
 BuildRequires:	logging-log4j
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servlet
+BuildRequires:	jdk < 1.6
 %if %(locale -a | grep -q '^en_US$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
@@ -62,8 +68,8 @@
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-install build/lib/logkit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+cp -a build/lib/logkit.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -92,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007-12-02 13:49:56  glen
+- builds with jdk 1.5 (just -target won't do)
+
 Revision 1.2  2007-12-02 13:44:05  glen
 - -javadoc patch from fc
 
================================================================

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