rpms/javasqlite/devel javasqlite-20090409-check-features.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 javasqlite.spec, 1.10, 1.11 sources, 1.5, 1.6

[Ville Skyttä]

Author: scop

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

Modified Files:
	.cvsignore javasqlite.spec sources 
Added Files:
	javasqlite-20090409-check-features.patch 
Log Message:
* Sun Apr 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090409-1
- Update to 20090409, enable extension loading.
- Patch to actually check features of system sqlite lib at build time.


javasqlite-20090409-check-features.patch:

--- NEW FILE javasqlite-20090409-check-features.patch ---
diff -up javasqlite-20090409/configure~ javasqlite-20090409/configure
--- javasqlite-20090409/configure~	2009-02-25 12:17:46.000000000 +0200
+++ javasqlite-20090409/configure	2009-04-12 22:02:41.000000000 +0300
@@ -7655,10 +7655,6 @@ else
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 fi
-if test -z "$SQLITE3_A10N_C" ; then
-  SQLITE3_A10N_C="native/dummy.c"
-  SQLITE3_A10N_O="dummy.lo"
-fi
 
 
 
@@ -8817,7 +8813,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
 echo "${ECHO_T}$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6
 if test $ac_cv_lib_sqlite3_sqlite3_load_extension = yes; then
-  HAVE_SQLITE3_LOAD_EXTENSION=
+  HAVE_SQLITE3_LOAD_EXTENSION=1
 else
   HAVE_SQLITE3_LOAD_EXTENSION=0
 fi
@@ -8841,6 +8837,10 @@ fi
 
 
 
+if test -z "$SQLITE3_A10N_C" ; then
+  SQLITE3_A10N_C="native/dummy.c"
+  SQLITE3_A10N_O="dummy.lo"
+fi
 
 
 
diff -up javasqlite-20090409/configure.in~ javasqlite-20090409/configure.in
--- javasqlite-20090409/configure.in~	2009-02-25 12:17:41.000000000 +0200
+++ javasqlite-20090409/configure.in	2009-04-12 22:01:47.000000000 +0300
@@ -230,15 +230,8 @@ else
   HAVE_SQLITE3=1
   AC_MSG_RESULT(yes)
 fi
-if test -z "$SQLITE3_A10N_C" ; then
-  SQLITE3_A10N_C="native/dummy.c"
-  SQLITE3_A10N_O="dummy.lo"
-fi
 AC_SUBST(SQLITE3_INC)
 AC_SUBST(SQLITE3_LIB)
-AC_SUBST(SQLITE3_A10N_C)
-AC_SUBST(SQLITE3_A10N_O)
-AC_SUBST(SQLITE3_A10N_FLAGS)
 AC_SUBST(HAVE_SQLITE3)
 
 ##########
@@ -331,7 +324,7 @@ if test "$HAVE_SQLITE3" = 1 -a -z "$SQLI
 	       HAVE_SQLITE3_OPEN_V2=1,HAVE_SQLITE3_OPEN_V2=0)
   if test "$enable_load_extension" = "yes" ; then
     AC_CHECK_LIB(sqlite3,sqlite3_load_extension,
-		 HAVE_SQLITE3_LOAD_EXTENSION=,HAVE_SQLITE3_LOAD_EXTENSION=0)
+		 HAVE_SQLITE3_LOAD_EXTENSION=1,HAVE_SQLITE3_LOAD_EXTENSION=0)
   fi
   LIBS=$saved_LIBS
   CFLAGS=$saved_CFLAGS
@@ -354,6 +347,14 @@ AC_SUBST(HAVE_SQLITE3_SHARED_CACHE)
 AC_SUBST(HAVE_SQLITE3_OPEN_V2)
 AC_SUBST(HAVE_SQLITE3_LOAD_EXTENSION)
 
+if test -z "$SQLITE3_A10N_C" ; then
+  SQLITE3_A10N_C="native/dummy.c"
+  SQLITE3_A10N_O="dummy.lo"
+fi
+AC_SUBST(SQLITE3_A10N_C)
+AC_SUBST(SQLITE3_A10N_O)
+AC_SUBST(SQLITE3_A10N_FLAGS)
+
 ##########
 # Any usable SQLite found ?
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	28 Feb 2009 01:37:24 -0000	1.5
+++ .cvsignore	14 Apr 2009 08:21:29 -0000	1.6
@@ -1 +1 @@
-javasqlite-20090213.tar.gz
+javasqlite-20090409.tar.gz


Index: javasqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/javasqlite.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- javasqlite.spec	25 Feb 2009 09:03:46 -0000	1.10
+++ javasqlite.spec	14 Apr 2009 08:21:30 -0000	1.11
@@ -1,8 +1,6 @@
-%global rpmver  %(v=$(rpmbuild --version | sed -e 's/.* //') ; echo ${v:-0})
-
 Name:           javasqlite
-Version:        20090213
-Release:        2%{?dist}
+Version:        20090409
+Release:        1%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -11,6 +9,8 @@
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # jnipath: Fedora specific, no need to send upstream.
 Patch0:         %{name}-20081006-jnipath.patch
+# Sent upstream 20090412
+Patch1:         %{name}-20090409-check-features.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sqlite-devel
@@ -27,7 +27,7 @@
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation
-%if "%{rpmver}" >= "4.6.0"
+%if 0%{?fedora} > 9
 BuildArch:      noarch
 %endif
 Requires:       java-javadoc
@@ -39,6 +39,7 @@
 %prep
 %setup -q
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1
+%patch1 -p1
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 
@@ -46,18 +47,20 @@
 %build
 
 origpath="$PATH"
+common_flags="
+    --enable-load-extension
+    --with-jardir=%{_libdir}/%{name}
+    --libdir=%{_libdir}/%{name}
+"
 
 # 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
+%configure $common_flags --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-1.6.0 \
-    --with-jardir=%{_libdir}/%{name} \
-    --libdir=%{_libdir}/%{name}
+%configure $common_flags --with-jdk=%{_jvmdir}/java-1.6.0
 make %{?_smp_mflags}
 
 # Add JDBC 3 classes
@@ -101,6 +104,10 @@
 
 
 %changelog
+* Sun Apr 12 2009 Ville Skyttä <ville.skytta at iki.fi> - 20090409-1
+- Update to 20090409, enable extension loading.
+- Patch to actually check features of system sqlite lib at build time.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20090213-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javasqlite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	28 Feb 2009 01:37:24 -0000	1.5
+++ sources	14 Apr 2009 08:21:30 -0000	1.6
@@ -1 +1 @@
-13cfd717bed81409504abf73c0d59260  javasqlite-20090213.tar.gz
+fab26fee79be07fe3097b39ead7046d4  javasqlite-20090409.tar.gz