rpms/javasqlite/F-9 javasqlite-20081006-jnipath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 javasqlite.spec, 1.3, 1.4 sources, 1.3, 1.4 javasqlite-20080315-jnipath.patch, 1.1, NONE

Ville Skyttä scop at fedoraproject.org
Sun Nov 30 12:24:45 UTC 2008


Author: scop

Update of /cvs/pkgs/rpms/javasqlite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13261/F-9

Modified Files:
	.cvsignore javasqlite.spec sources 
Added Files:
	javasqlite-20081006-jnipath.patch 
Removed Files:
	javasqlite-20080315-jnipath.patch 
Log Message:
* Sun Nov 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-2
- Own the /usr/lib*/javasqlite dir (#473609).

* Tue Oct 07 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-1
- 20081006; all upstreamable patches applied upstream.


javasqlite-20081006-jnipath.patch:

--- NEW FILE javasqlite-20081006-jnipath.patch ---
diff -up javasqlite-20081006/Makefile.in.orig javasqlite-20081006/Makefile.in
--- javasqlite-20081006/Makefile.in.orig	2008-10-06 11:05:57.000000000 +0300
+++ javasqlite-20081006/Makefile.in	2008-10-07 19:54:02.000000000 +0300
@@ -150,16 +150,16 @@ configure:	configure.in
 test:
 	$(JAVAC) -classpath sqlite.jar:$(PWD) test.java
 	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
-	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) test
+	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test
 
 test2:	test
 	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
-	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) test db2
+	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test db2
 
 test3:
 	$(JAVAC) -classpath sqlite.jar:$(PWD) test3.java
 	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:$(PWD)/.libs" \
-	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) test3
+	$(JAVA_RUN) -classpath sqlite.jar:$(PWD) -DSQLite.library.path=$(PWD)/.libs test3
 
 clean:
 	$(RM) SQLite/*.class SQLite/@JDBCVER@/*.class *.lo *.la *.o *~ \
diff -up javasqlite-20081006/SQLite/Database.java.orig javasqlite-20081006/SQLite/Database.java
--- javasqlite-20081006/SQLite/Database.java.orig	2008-10-06 11:03:04.000000000 +0300
+++ javasqlite-20081006/SQLite/Database.java	2008-10-07 19:51:00.000000000 +0300
@@ -783,7 +783,7 @@ public class Database {
 	try {
 	    String path = System.getProperty("SQLite.library.path");
 	    if (path == null || path.length() == 0) {
-		System.loadLibrary("sqlite_jni");
+		System.load("@JNIPATH@/" + System.mapLibraryName("sqlite_jni"));
 	    } else {
 		try {
 		    java.lang.reflect.Method mapLibraryName;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 May 2008 15:40:42 -0000	1.3
+++ .cvsignore	30 Nov 2008 12:24:14 -0000	1.4
@@ -1 +1 @@
-javasqlite-20080420.tar.gz
+javasqlite-20081006.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/javasqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- javasqlite.spec	14 May 2008 15:40:42 -0000	1.3
+++ javasqlite.spec	30 Nov 2008 12:24:14 -0000	1.4
@@ -1,22 +1,19 @@
-# 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:        1%{?dist}
+Version:        20081006
+Release:        2%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.ch-werner.de/javasqlite/
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
-# jnipath: Fedora specific, no need to send upstream
-Patch0:         %{name}-20080315-jnipath.patch
+# jnipath: Fedora specific, no need to send upstream.
+Patch0:         %{name}-20081006-jnipath.patch
 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
 
@@ -42,11 +39,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
 
 
@@ -63,12 +74,19 @@
 
 
 %check
-make test
+origpath="$PATH"
+for javaver in 1.5.0 1.6.0 ; do
+    jdir=%{_jvmdir}/java-$javaver/bin
+    export PATH="$jdir:$origpath" # bug 460761
+    # test2 is for SQLite 2.x, which we don't support
+    make JAVA_RUN="$jdir/java" JAVAC="$jdir/javac" test test3
+done
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog license.terms
+%dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/sqlite.jar
 %{_libdir}/%{name}/libsqlite_jni.so
 
@@ -78,6 +96,22 @@
 
 
 %changelog
+* Sun Nov 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-2
+- Own the /usr/lib*/javasqlite dir (#473609).
+
+* Tue Oct  7 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-1
+- 20081006; all upstreamable patches applied upstream.
+
+* 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.
+- Patch test suite to exit with non-zero status on failures.
+- Run more tests during build, but not SQLite 2.x ones.
+
 * Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 20080420-1
 - 20080420; all upstreamable patches applied upstream.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 May 2008 15:40:42 -0000	1.3
+++ sources	30 Nov 2008 12:24:14 -0000	1.4
@@ -1 +1 @@
-1ca6eca130049d888a3f8783261bcdf8  javasqlite-20080420.tar.gz
+f8aee5c34cf7248c89d8fa2f3711bca2  javasqlite-20081006.tar.gz


--- javasqlite-20080315-jnipath.patch DELETED ---




More information about the fedora-extras-commits mailing list