diff --git a/sqlite-strcasecmp.patch b/sqlite-strcasecmp.patch index d354185..45d97ac 100644 --- a/sqlite-strcasecmp.patch +++ b/sqlite-strcasecmp.patch @@ -1,8 +1,5 @@ -Index: sqlite/src/tclsqlite.c -RCS File: /sqlite/sqlite/src/tclsqlite.c,v -rcsdiff -q -kk '-r1.212' '-r1.213' -u '/sqlite/sqlite/src/tclsqlite.c,v' 2>/dev/null ---- tclsqlite.c 2008/03/25 16:16:29 1.212 -+++ tclsqlite.c 2008/04/04 12:21:09 1.213 +--- src/tclsqlite.c 2008/03/25 16:16:29 1.212 ++++ src/tclsqlite.c 2008/04/04 12:21:09 1.213 @@ -1340,11 +1340,11 @@ Tcl_AppendResult(interp,"Error: non-null separator required for copy",0); return TCL_ERROR; diff --git a/sqlite3-tcl85.diff b/sqlite3-tcl85.diff index e0174e5..ac0065f 100644 --- a/sqlite3-tcl85.diff +++ b/sqlite3-tcl85.diff @@ -1,49 +1,19 @@ Index: sqlite/test/tclsqlite.test RCS File: /sqlite/sqlite/test/tclsqlite.test,v -rcsdiff -q -kk '-r1.63' '-r1.64' -u '/sqlite/sqlite/test/tclsqlite.test,v' 2>/dev/null ---- test/tclsqlite.test 2007/10/23 08:17:48 1.63 -+++ test/tclsqlite.test 2008/04/28 13:02:58 1.64 -@@ -69,15 +69,15 @@ - } msg] - lappend v $msg - } {0 {}} -+catch {expr x*} msg - do_test tcl-1.6 { - set v [catch { - db eval {SELECT * FROM t1} data { - expr x* - } - } msg] -- regsub {:.*$} $msg {} msg - lappend v $msg --} {1 {syntax error in expression "x*"}} -+} [list 1 $msg] - do_test tcl-1.7 { - set v [catch {db} msg] - lappend v $msg -Index: sqlite/test/types3.test -RCS File: /sqlite/sqlite/test/types3.test,v -rcsdiff -q -kk '-r1.7' '-r1.8' -u '/sqlite/sqlite/test/types3.test,v' 2>/dev/null ---- test/types3.test 2007/06/26 22:42:56 1.7 -+++ test/types3.test 2008/04/28 13:02:58 1.8 -@@ -74,10 +74,11 @@ - set V [db one {SELECT 123}] - tcl_variable_type V - } int -+set Vx [expr {1+wide(123456789123456)}] - do_test types3-2.3 { - set V [db one {SELECT 1234567890123456}] - tcl_variable_type V --} wideInt -+} [tcl_variable_type Vx] - do_test types3-2.4.1 { - set V [db one {SELECT 1234567890123456.1}] - tcl_variable_type V -Index: sqlite/src/test1.c -RCS File: /sqlite/sqlite/src/test1.c,v -rcsdiff -q -kk '-r1.299' '-r1.300' -u '/sqlite/sqlite/src/test1.c,v' 2>/dev/null ---- src/test1.c 2008/04/16 12:58:54 1.299 -+++ src/test1.c 2008/04/28 15:23:03 1.300 +================================================================================ +--- Makefile.in ++++ Makefile.in +@@ -392,7 +392,7 @@ + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o $@ tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \ ++ libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + -rpath "$(libdir)/sqlite" \ + -version-info "8:6:8" + +--- src/test1.c ++++ src/test1.c @@ -2621,8 +2621,20 @@ if( getStmtPointer(interp, Tcl_GetString(objv[1]), &pStmt) ) return TCL_ERROR; @@ -66,3 +36,38 @@ rcsdiff -q -kk '-r1.299' '-r1.300' -u '/sqlite/sqlite/src/test1.c,v' 2>/dev/null rc = sqlite3_bind_double(pStmt, idx, value); if( sqlite3TestErrCode(interp, StmtToDb(pStmt), rc) ) return TCL_ERROR; if( rc!=SQLITE_OK ){ +--- test/tclsqlite.test ++++ test/tclsqlite.test +@@ -69,15 +69,15 @@ + } msg] + lappend v $msg + } {0 {}} ++catch {expr x*} msg + do_test tcl-1.6 { + set v [catch { + db eval {SELECT * FROM t1} data { + expr x* + } + } msg] +- regsub {:.*$} $msg {} msg + lappend v $msg +-} {1 {syntax error in expression "x*"}} ++} [list 1 $msg] + do_test tcl-1.7 { + set v [catch {db} msg] + lappend v $msg +--- test/types3.test ++++ test/types3.test +@@ -74,10 +74,11 @@ + set V [db one {SELECT 123}] + tcl_variable_type V + } int ++set Vx [expr {1+wide(123456789123456)}] + do_test types3-2.3 { + set V [db one {SELECT 1234567890123456}] + tcl_variable_type V +-} wideInt ++} [tcl_variable_type Vx] + do_test types3-2.4.1 { + set V [db one {SELECT 1234567890123456.1}] + tcl_variable_type V diff --git a/sqlite3.changes b/sqlite3.changes index 4e6ae23..a4ffd85 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 8 15:03:21 CEST 2008 - max@suse.de + +- Actually apply sqlite-strcasecmp.patch to fix the Tcl extension. +- Link the Tcl extension dynamically. + ------------------------------------------------------------------- Wed May 7 21:38:43 CEST 2008 - coolo@suse.de diff --git a/sqlite3.spec b/sqlite3.spec index de649df..7f25b87 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -21,7 +21,7 @@ Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine Url: http://www.sqlite.org/ Version: 3.5.7 -Release: 10 +Release: 12 Requires: libsqlite3-0 = %version Provides: sqlite = %version Obsoletes: sqlite < %version @@ -132,6 +132,7 @@ Authors: %patch2 %patch8 %patch9 +%patch10 # does not work due to our ulimits in our build system rm test/bigfile.test @@ -200,6 +201,9 @@ autoreconf -f -i %_libdir/pkgconfig/sqlite3.pc %changelog +* Thu May 08 2008 max@suse.de +- Actually apply sqlite-strcasecmp.patch to fix the Tcl extension. +- Link the Tcl extension dynamically. * Wed May 07 2008 coolo@suse.de - provide sqlite- * Tue Apr 29 2008 cthiel@suse.de