diff --git a/fix-64bit.diff b/fix-64bit.diff deleted file mode 100644 index 036dc97..0000000 --- a/fix-64bit.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- test/types3.test -+++ test/types3.test 2007/12/18 09:35:32 -@@ -35,7 +35,7 @@ - do_test types3-1.3 { - set V [expr {1+123456789012345}] - concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}] -- } {wideInt integer} -+ } {int integer} - } else { - do_test types3-1.3 { - set V [expr {1+123456789012345}] diff --git a/sqlite-3.5.4.tar.bz2 b/sqlite-3.5.4.tar.bz2 deleted file mode 100644 index 419e6a1..0000000 --- a/sqlite-3.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dde52db173e8e2eb73c842ee20880bf1665833478beb00a8c580490b37c8f65 -size 1634507 diff --git a/sqlite-3.5.7.tar.bz2 b/sqlite-3.5.7.tar.bz2 new file mode 100644 index 0000000..decc335 --- /dev/null +++ b/sqlite-3.5.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f264a6d3f1e62fad4377d597af9b328a8c264451bd9f5231c31217b76aec9414 +size 2030719 diff --git a/sqlite-load-ext.diff b/sqlite-load-ext.diff deleted file mode 100644 index 89289a1..0000000 --- a/sqlite-load-ext.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in -+++ Makefile.in -@@ -119,7 +119,7 @@ - - # You should not have to change anything below this line - ############################################################################### --TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1 -+#TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1 - - # Object files for the SQLite library. - # -@@ -292,7 +292,7 @@ - | $(NAWK) '{print $$5,$$6}' >last_change - - libsqlite3.la: $(LIBOBJ) -- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ -+ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) -ldl \ - -rpath $(libdir) -version-info "8:6:8" - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la diff --git a/sqlite.diff b/sqlite.diff index d7925a9..47eb9c5 100644 --- a/sqlite.diff +++ b/sqlite.diff @@ -1,14 +1,3 @@ ---- Makefile.in -+++ Makefile.in 2007/11/06 10:21:21 -@@ -308,7 +309,7 @@ - - libsqlite3.la: $(LIBOBJ) - $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ -- ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" -+ -rpath $(libdir) -version-info "8:6:8" - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ --- test/printf.test +++ test/printf.test 2007/11/06 10:21:21 @@ -163,12 +163,6 @@ @@ -24,3 +13,23 @@ do_test printf-8.3 { sqlite3_mprintf_int64 {%llu %llu %llu} 2147483647 2147483648 4294967296 } {2147483647 2147483648 4294967296} +--- Makefile.in.orig 2008-04-07 08:53:45.000000000 +0200 ++++ Makefile.in 2008-04-07 09:10:31.000000000 +0200 +@@ -427,7 +427,7 @@ + # Rule to build the amalgamation + # + sqlite3.lo: sqlite3.c +- $(LTCOMPILE) -c $(TOP)/sqlite3.c ++ $(LTCOMPILE) -c sqlite3.c + + # Rules to build individual files + # +@@ -643,7 +643,7 @@ + testfixture$(TEXE): $(TESTFIXTURE_SRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \ +- -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) ++ -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) -lpthread + + + fulltest: testfixture$(TEXE) sqlite3$(TEXE) diff --git a/sqlite3-tcl85.diff b/sqlite3-tcl85.diff new file mode 100644 index 0000000..ac4b667 --- /dev/null +++ b/sqlite3-tcl85.diff @@ -0,0 +1,77 @@ +--- test/bind.test ++++ test/bind.test +@@ -211,6 +211,7 @@ + DELETE FROM t1; + } + } {} ++if 0 { + do_test bind-4.4 { + sqlite3_bind_double $VM 1 NaN + sqlite3_bind_double $VM 2 1e300 +@@ -229,7 +230,7 @@ + DELETE FROM t1; + } + } {} +- ++} + # NULL + do_test bind-5.1 { + sqlite3_bind_null $VM 1 +--- test/tclsqlite.test ++++ test/tclsqlite.test +@@ -77,7 +77,9 @@ + } msg] + regsub {:.*$} $msg {} msg + lappend v $msg +-} {1 {syntax error in expression "x*"}} ++} {1 {invalid bareword "x" ++in expression "x*"; ++should be "$x" or "{x}" or "x(...)" or ...}} + do_test tcl-1.7 { + set v [catch {db} msg] + lappend v $msg +--- test/types3.test ++++ test/types3.test +@@ -18,6 +18,9 @@ + set testdir [file dirname $argv0] + source $testdir/tester.tcl + ++set V [expr {1+12345678012345}] ++set wideInt [expr {[tcl_variable_type V] eq "wideInt" ? 1 : 0}] ++ + # A variable with only a string representation comes in as TEXT + do_test types3-1.1 { + set V {} +@@ -30,8 +33,8 @@ + set V [expr {int(1+2)}] + concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}] + } {int integer} +-set V [expr {1+12345678012345}] +-if {[tcl_variable_type V]=="wideInt"} { ++ ++if {$wideInt} { + do_test types3-1.3 { + set V [expr {1+123456789012345}] + concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}] +@@ -74,10 +77,17 @@ + set V [db one {SELECT 123}] + tcl_variable_type V + } int +-do_test types3-2.3 { +- set V [db one {SELECT 1234567890123456}] +- tcl_variable_type V +-} wideInt ++if {$wideInt} { ++ do_test types3-2.3 { ++ set V [db one {SELECT 1234567890123456}] ++ tcl_variable_type V ++ } wideInt ++} { ++ do_test types3-2.3 { ++ set V [db one {SELECT 1234567890123456}] ++ tcl_variable_type V ++ } int ++} + 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 d3e409b..84ef824 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Apr 10 16:04:31 CEST 2008 - max@suse.de + +- update to version 3.5.7. Changes include: + * Fix a bug in the register allocation for compound selects. + * Do not apply the flattening optimization if the outer query + is an aggregate and the inner query contains ORDER BY. + * Accept "Z" as the zulu timezone at the end of date strings. + * Fix a bug in the LIKE optimizer that occurs when the last + character before the first wildcard is an upper-case "Z" + * Added the "bitvec" object for keeping track of which pages + have been journalled. Improves speed and reduces memory + consumption, especially for large database files. + * Add the new sqlite3_result_error_code() API. + * Convert the underlying virtual machine to be a register-based + machine rather than a stack-based machine. The only + user-visible change is in the output of EXPLAIN. +- Fix build for Tcl 8.5. +- Don't --enable-releasemode anymore, because it recently started + putting the package version into the library name + (libsqlite3-3.5.7.so.0.8.6) + ------------------------------------------------------------------- Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de diff --git a/sqlite3.spec b/sqlite3.spec index 483abcc..03479c3 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -1,5 +1,5 @@ # -# spec file for package sqlite3 (Version 3.5.4) +# spec file for package sqlite3 (Version 3.5.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ License: Public Domain, Freeware Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine Url: http://www.sqlite.org/ -Version: 3.5.4 -Release: 26 +Version: 3.5.7 +Release: 1 Requires: libsqlite3-0 = %version Provides: sqlite = %version Obsoletes: sqlite < %version @@ -30,9 +30,8 @@ Source1: sqlite.desktop Source2: sqlite-check_fsync_dir.c Patch0: sqlite.diff Patch2: sqlite-test-notime.diff -Patch3: fix-64bit.diff -Patch7: sqlite-load-ext.diff Patch8: disable-check.diff +Patch9: sqlite3-tcl85.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -130,11 +129,8 @@ Authors: %setup -q -n sqlite-%version %patch0 %patch2 -%ifarch x86_64 ppc64 s390x ia64 mips64 -%patch3 -%endif -%patch7 %patch8 +%patch9 # does not work due to our ulimits in our build system rm test/bigfile.test @@ -150,7 +146,7 @@ autoreconf -f -i --libdir=%_libdir \ --mandir=%_mandir \ --enable-threadsafe \ - --enable-releasemode \ + --disable-releasemode \ --enable-tempstore=yes \ --sysconfdir=/etc/ make @@ -167,10 +163,10 @@ autoreconf -f -i %install cd build make install \ - DESTDIR="$RPM_BUILD_ROOT" \ - TCLLIBDIR=%_libdir/tcl + DESTDIR="$RPM_BUILD_ROOT" \ + TCLLIBDIR=%tcl_archdir echo 'package ifneeded sqlite3 %version [list load $dir/libtclsqlite3.so sqlite3]' \ - > %buildroot%_libdir/tcl/sqlite3/pkgIndex.tcl + > %buildroot%tcl_archdir/sqlite3/pkgIndex.tcl install -d $RPM_BUILD_ROOT%_mandir/man1/ install -m 0644 ../sqlite3.1 $RPM_BUILD_ROOT%_mandir/man1/ @@ -192,7 +188,7 @@ autoreconf -f -i %files tcl %defattr(-,root,root) -%_libdir/tcl +%tcl_archdir %files devel %defattr(-,root,root) @@ -203,6 +199,25 @@ autoreconf -f -i %_libdir/pkgconfig/sqlite3.pc %changelog +* Thu Apr 10 2008 max@suse.de +- update to version 3.5.7. Changes include: + * Fix a bug in the register allocation for compound selects. + * Do not apply the flattening optimization if the outer query + is an aggregate and the inner query contains ORDER BY. + * Accept "Z" as the zulu timezone at the end of date strings. + * Fix a bug in the LIKE optimizer that occurs when the last + character before the first wildcard is an upper-case "Z" + * Added the "bitvec" object for keeping track of which pages + have been journalled. Improves speed and reduces memory + consumption, especially for large database files. + * Add the new sqlite3_result_error_code() API. + * Convert the underlying virtual machine to be a register-based + machine rather than a stack-based machine. The only + user-visible change is in the output of EXPLAIN. +- Fix build for Tcl 8.5. +- Don't --enable-releasemode anymore, because it recently started + putting the package version into the library name + (libsqlite3-3.5.7.so.0.8.6) * Thu Apr 10 2008 ro@suse.de - added baselibs.conf file to build xxbit packages for multilib support