gunnar: server/sqlite sqlite.patch.v3,1.2,1.3 sqlite.spec,1.3,1.4

cvs at kolab.org cvs at kolab.org
Tue Mar 9 09:36:41 CET 2010


Author: gunnar

Update of /kolabrepository/server/sqlite
In directory doto:/tmp/cvs-serv16400

Modified Files:
	sqlite.patch.v3 sqlite.spec 
Log Message:
Update to newer sqlite version, enable loading extensions and fix a Makefile bug.

Index: sqlite.patch.v3
===================================================================
RCS file: /kolabrepository/server/sqlite/sqlite.patch.v3,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sqlite.patch.v3	27 Oct 2008 17:21:39 -0000	1.2
+++ sqlite.patch.v3	9 Mar 2010 08:36:38 -0000	1.3
@@ -1,6 +1,6 @@
-Index: sqlite-3.6.4/Makefile.in
---- sqlite-3.6.4/Makefile.in.orig	2008-10-14 20:07:37 +0200
-+++ sqlite-3.6.4/Makefile.in	2008-10-15 19:59:08 +0200
+Index: sqlite-3.6.22/Makefile.in
+--- sqlite-3.6.22/Makefile.in.orig	2008-10-14 20:07:37 +0200
++++ sqlite-3.6.22/Makefile.in	2008-10-15 19:59:08 +0200
 @@ -179,6 +179,30 @@
  LIBOBJ = $(OBJS$(USE_AMALGAMATION))
  
@@ -32,6 +32,15 @@
  # All of the source code files.
  #
  SRC = \
+@@ -486,7 +486,7 @@
+ 	./config.status
+ 
+ libsqlite3.la:	$(LIBOBJ)
+-	$(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \
++	$(LTLINK) -o $@ -ldl $(LIBOBJ) $(TLIBS) \
+ 		${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
+ 
+ libtclsqlite3.la:	tclsqlite.lo libsqlite3.la
 @@ -786,3 +810,38 @@
  sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
  	$(TCC) -shared -o $@ sqlite3.def \
@@ -71,9 +80,9 @@
 +rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
 +
-Index: sqlite-3.6.4/sqlite3.pc.in
---- sqlite-3.6.4/sqlite3.pc.in.orig	2008-10-14 20:07:39 +0200
-+++ sqlite-3.6.4/sqlite3.pc.in	2008-10-15 19:59:34 +0200
+Index: sqlite-3.6.22/sqlite3.pc.in
+--- sqlite-3.6.22/sqlite3.pc.in.orig	2008-10-14 20:07:39 +0200
++++ sqlite-3.6.22/sqlite3.pc.in	2008-10-15 19:59:34 +0200
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine

Index: sqlite.spec
===================================================================
RCS file: /kolabrepository/server/sqlite/sqlite.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sqlite.spec	12 Dec 2008 13:21:34 -0000	1.3
+++ sqlite.spec	9 Mar 2010 08:36:38 -0000	1.4
@@ -23,7 +23,7 @@
 ##
 
 #   package version
-%define       V_v3   3.6.4
+%define       V_v3   3.6.22
 %define       V_v2   2.8.17
 
 #   package information
@@ -36,7 +36,7 @@
 Group:        Database
 License:      PD
 Version:      %{V_v3}
-Release:      20081212
+Release:      20100309
 
 #   package options
 %option       with_utf8            no
@@ -167,7 +167,8 @@
 %endif
         --disable-tcl \
         --disable-amalgamation \
-        --disable-shared
+        --disable-shared \
+        --enable-load-extension
     MFLAGS=""
 %if "%{with_fts3}" == "yes"
     MFLAGS="$MFLAGS FTS3=1"





More information about the commits mailing list