upgrading package: sqlite 3.6.23.1 -> 3.7.0

sqlite/sqlite.patch

@@ -1,20 +1,27 @@
 Index: Makefile.in
---- Makefile.in.orig	2010-01-05 01:02:40 +0100
-+++ Makefile.in	2010-01-30 20:42:09 +0100
-@@ -187,6 +187,23 @@
- USE_AMALGAMATION = @USE_AMALGAMATION@
- LIBOBJ = $(OBJS$(USE_AMALGAMATION))
+--- Makefile.in.orig	2010-07-18 21:30:41.000000000 +0200
++++ Makefile.in	2010-07-22 21:25:22.000000000 +0200
+@@ -181,7 +181,7 @@
+          table.lo tokenize.lo trigger.lo \
+          update.lo util.lo vacuum.lo \
+          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
+-         wal.lo walker.lo where.lo utf.o vtab.lo
++         wal.lo walker.lo where.lo utf.lo vtab.lo
+ 
+ # Object files for the amalgamation.
+ #
+@@ -191,6 +191,21 @@
+ #
+ LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
  
 +# FTS3 support
 +ifdef FTS3
 +TCC    += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
-+LIBOBJ += fts3.lo fts3_hash.lo fts3_expr.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
 +endif
 +
 +# RTREE support
 +ifdef RTREE
 +TCC    += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
-+LIBOBJ += rtree.lo
 +endif
 +
 +# REGEXP support
@@ -25,46 +32,27 @@ Index: Makefile.in
  
  # All of the source code files.
  #
-@@ -329,6 +346,8 @@
+@@ -325,6 +340,8 @@
  SRC += \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
 +SRC += \
 +  $(TOP)/ext/regexp/regexp.c
  
- # Source code to the library files needed by the test fixture
- #
-@@ -477,6 +496,27 @@
- 		-o $@ $(TOP)/src/shell.c libsqlite3.la \
- 		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
  
-+fts3.lo:	$(TOP)/ext/fts3/fts3.c $(HDR)
-+	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
-+fts3_hash.lo:	$(TOP)/ext/fts3/fts3_hash.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
-+fts3_expr.lo:	$(TOP)/ext/fts3/fts3_expr.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c
-+fts3_icu.lo:	$(TOP)/ext/fts3/fts3_icu.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
-+fts3_porter.lo:	$(TOP)/ext/fts3/fts3_porter.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
-+fts3_tokenizer.lo:	$(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
-+fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
-+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
-+
-+rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR)
-+	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
-+
-+regexp.lo:	$(TOP)/ext/regexp/regexp.c $(HDR)
+ # Generated source code files
+@@ -835,6 +852,8 @@
+ rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
+ 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
+ 
++regexp.lo: $(TOP)/ext/regexp/regexp.c $(HDR) $(EXTHDR)
 +	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/regexp/regexp.c
-+
- # This target creates a directory named "tsrc" and fills it with
- # copies of all of the C source code and header files needed to
- # build on the target system.  Some of the C source code and header
+ 
+ # Rules to build the 'testfixture' application.
+ #
 Index: configure
---- configure.orig	2010-01-05 01:02:40 +0100
-+++ configure	2010-01-30 20:00:15 +0100
+--- configure.orig	2010-07-18 21:30:41.000000000 +0200
++++ configure	2010-07-22 21:24:57.000000000 +0200
 @@ -6012,11 +6012,7 @@
  if $ac_preproc_ok; then
    :
@@ -79,8 +67,8 @@ Index: configure
  
  ac_ext=c
 Index: ext/regexp/regexp.c
---- ext/regexp/regexp.c.orig	2010-01-30 20:00:15 +0100
-+++ ext/regexp/regexp.c	2010-01-30 20:43:01 +0100
+--- ext/regexp/regexp.c.orig	2010-07-22 21:24:57.000000000 +0200
++++ ext/regexp/regexp.c	2010-07-22 21:24:57.000000000 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * SQLite REGEXP(regex, string) function
@@ -230,8 +218,8 @@ Index: ext/regexp/regexp.c
 +#endif
 +
 Index: sqlite3.pc.in
---- sqlite3.pc.in.orig	2009-09-03 22:32:06 +0200
-+++ sqlite3.pc.in	2010-01-30 20:00:15 +0100
+--- sqlite3.pc.in.orig	2010-06-21 13:48:22.000000000 +0200
++++ sqlite3.pc.in	2010-07-22 21:24:57.000000000 +0200
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine
@@ -241,9 +229,9 @@ Index: sqlite3.pc.in
 +Libs: -L${libdir} -lsqlite3 @LIBS@
  Cflags: -I${includedir}
 Index: src/main.c
---- src/main.c.orig	2010-01-05 01:02:40 +0100
-+++ src/main.c	2010-01-30 20:43:26 +0100
-@@ -1715,6 +1715,13 @@
+--- src/main.c.orig	2010-07-18 21:30:41.000000000 +0200
++++ src/main.c	2010-07-22 21:24:57.000000000 +0200
+@@ -1869,6 +1869,13 @@
    }
  #endif
  

sqlite/sqlite.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_sqlite   3.6.23.1
+%define       V_sqlite   3.7.0
 %define       V_odbc     0.86
 %define       V_jdbc     20100709
 
@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Database
 License:      PD
 Version:      %{V_sqlite}
-Release:      20100709
+Release:      20100722
 
 #   package options
 %option       with_debug           no
@@ -116,7 +116,7 @@ PreReq:       java, JAVA-JDK
     CC="%{l_cc}"
     CFLAGS="%{l_cflags -O}"
     CPPFLAGS="-I. %{l_cppflags}"
-    LDFLAGS="%{l_ldflags}"
+    LDFLAGS="-L. %{l_ldflags}"
     LIBS="-lm"
     export CC
     export CPPFLAGS