rpms/javasqlite/EL-5 javasqlite-20090430-jnipath.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 javasqlite.spec, 1.3, 1.4 sources, 1.3, 1.4 javasqlite-20081006-jnipath.patch, 1.1, NONE

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/javasqlite/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27296

Modified Files:
	.cvsignore javasqlite.spec sources 
Added Files:
	javasqlite-20090430-jnipath.patch 
Removed Files:
	javasqlite-20081006-jnipath.patch 
Log Message:
* Fri May  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090430-1.1
- Update to 20090430.
- Don't use parallel make, Java build doesn't appear parallel clean.
- Run more tests during build if built with SQLite 3.4+.
- Improve description.


javasqlite-20090430-jnipath.patch:

--- NEW FILE javasqlite-20090430-jnipath.patch ---
diff -up javasqlite-20090430/SQLite/Database.java~ javasqlite-20090430/SQLite/Database.java
--- javasqlite-20090430/SQLite/Database.java~	2009-04-08 11:53:00.000000000 +0300
+++ javasqlite-20090430/SQLite/Database.java	2009-05-01 00:59:29.000000000 +0300
@@ -868,7 +868,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/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	30 Nov 2008 12:26:28 -0000	1.3
+++ .cvsignore	1 Jun 2009 20:22:01 -0000	1.4
@@ -1 +1 @@
-javasqlite-20081006.tar.gz
+javasqlite-20090430.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/EL-5/javasqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- javasqlite.spec	30 Nov 2008 12:26:28 -0000	1.3
+++ javasqlite.spec	1 Jun 2009 20:22:01 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           javasqlite
-Version:        20081006
-Release:        2%{?dist}.1
+Version:        20090430
+Release:        1%{?dist}.1
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -8,10 +8,12 @@ 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}-20081006-jnipath.patch
+Patch0:         %{name}-20090430-jnipath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
+# Not pulled in by EL 5.3 sqlite-devel
+BuildRequires:  pkgconfig
 BuildRequires:  java-devel = 1:1.6.0
 BuildRequires:  java-devel = 1.4.2
 BuildRequires:  java-javadoc
@@ -19,8 +21,8 @@ Requires:       jre
 
 %description
 javasqlite is a Java wrapper including a basic JDBC driver for the
-SQLite 2/3 database engine. It is designed using JNI to interface to
-the SQLite API.
+SQLite database engine. It is designed using JNI to interface to the
+SQLite API.
 
 %package        javadoc
 Summary:        API documentation for %{name}
@@ -41,19 +43,21 @@ f=ChangeLog ; iconv -f iso-8859-1 -t utf
 %build
 
 origpath="$PATH"
+# Note that --enable-load-extension has security concerns, see configure --help
+common_flags="
+    --with-jardir=%{_libdir}/%{name}
+    --libdir=%{_libdir}/%{name}
+"
 
 # Pass #1: JDBC 3 driver and common files with 1.4.2
 export PATH="%{_jvmdir}/java-1.4.2/bin:$origpath" # bug 460761
-%configure --with-jdk=%{_jvmdir}/java-1.4.2
-make %{?_smp_mflags} sqlite.jar JAVAC_FLAGS="-source 1.4"
+%configure $common_flags --with-jdk=%{_jvmdir}/java-1.4.2
+make sqlite.jar JAVAC_FLAGS="-source 1.4" # Java build not parallel clean
 
 # 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-1.6.0 \
-    --with-jardir=%{_libdir}/%{name} \
-    --libdir=%{_libdir}/%{name}
-make %{?_smp_mflags}
+%configure $common_flags --with-jdk=%{_jvmdir}/java-1.6.0
+make # Java build not parallel clean
 
 # Add JDBC 3 classes
 jar uf sqlite.jar SQLite/JDBC2x/*.class
@@ -79,8 +83,11 @@ for javaver in 1.4.2 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
-    # test3 uses zeroblob which is available in sqlite 3.4+ (EL-5 has 3.3.6)
     make JAVA_RUN="$jdir/java" JAVAC="$jdir/javac" test
+    # test3 uses zeroblob which is available in sqlite 3.4+
+    if pkg-config --atleast-version 3.4 sqlite3 ; then
+       make JAVA_RUN="$jdir/java" JAVAC="$jdir/javac" test3
+    fi
 done
 
 
@@ -97,6 +104,12 @@ done
 
 
 %changelog
+* Fri May  1 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090430-1.1
+- Update to 20090430.
+- Don't use parallel make, Java build doesn't appear parallel clean.
+- Run more tests during build if built with SQLite 3.4+.
+- Improve description.
+
 * Sun Nov 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 20081006-2.1
 - Own the /usr/lib*/javasqlite dir (#473609).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Nov 2008 12:26:28 -0000	1.3
+++ sources	1 Jun 2009 20:22:01 -0000	1.4
@@ -1 +1 @@
-f8aee5c34cf7248c89d8fa2f3711bca2  javasqlite-20081006.tar.gz
+fe17f7a5154cef4dbc5e5829b5c9682a  javasqlite-20090430.tar.gz


--- javasqlite-20081006-jnipath.patch DELETED ---