rpms/javasqlite/devel javasqlite.spec,1.4,1.5

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30829

Modified Files:
	javasqlite.spec 
Log Message:
* Mon Sep  1 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-3
- Include JDBC 3 (Java 1.5.x) drivers.
- Work around build setup issues #460761 and #460783.



Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- javasqlite.spec	30 Aug 2008 21:24:48 -0000	1.4
+++ javasqlite.spec	1 Sep 2008 18:52:29 -0000	1.5
@@ -1,10 +1,6 @@
-# TODO: build JDBC 3 driver too (not doable with gcj 1.5.0 - it apparently
-#       has java 1.6 (JDBC 4) class libs???)
-
-
 Name:           javasqlite
 Version:        20080420
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -19,7 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
-BuildRequires:  java-devel
+BuildRequires:  java-devel = 1:1.6.0
+BuildRequires:  java-devel = 1.5.0
 BuildRequires:  java-javadoc
 Requires:       jre
 
@@ -47,11 +44,25 @@
 
 
 %build
+
+origpath="$PATH"
+
+# Pass #1: JDBC 3 driver and common files with 1.5.0
+export PATH="%{_jvmdir}/java-1.5.0/bin:$origpath" # bug 460761
+%configure --with-jdk=%{_jvmdir}/java-1.5.0
+make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 5"
+
+# Pass #2: JDBC 4 driver and the rest with 1.6.0
+export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
 %configure \
-    --with-jdk=%{_jvmdir}/java \
+    --with-jdk=%{_jvmdir}/java-1.6.0 \
     --with-jardir=%{_libdir}/%{name} \
     --libdir=%{_libdir}/%{name}
-make %{?_smp_mflags} JAVAC_FLAGS="-source 5"
+make %{?_smp_mflags}
+
+# Add JDBC 3 classes
+jar uf sqlite.jar SQLite/JDBC2y/*.class
+
 make javadoc JAVADOCLINK=%{_javadocdir}/java
 
 
@@ -73,8 +84,10 @@
 # loading the just built one fails, see static initializer in SQLite.Database.
 export LD_LIBRARY_PATH="$PWD/.libs:$LD_LIBRARY_PATH"
 
-# test2 is for SQLite 2.x, which we don't support
-make test test3
+for javaver in 1.5.0 1.6.0 ; do
+    # test2 is for SQLite 2.x, which we don't support
+    make JAVA_RUN="%{_jvmdir}/java-$javaver/bin/java" test test3
+done
 
 
 %files
@@ -89,6 +102,10 @@
 
 
 %changelog
+* Mon Sep  1 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-3
+- Include JDBC 3 (Java 1.5.x) drivers.
+- Work around build setup issues #460761 and #460783.
+
 * Sun Aug 31 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-2
 - Patch to output error message if loading the lib from a specified
   SQLite.library.path fails.