diff --git a/sqlite-autoconf-3110000.tar.gz b/sqlite-autoconf-3110000.tar.gz deleted file mode 100644 index 9b94845..0000000 --- a/sqlite-autoconf-3110000.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb -size 2359347 diff --git a/sqlite-autoconf-3110100.tar.gz b/sqlite-autoconf-3110100.tar.gz new file mode 100644 index 0000000..931ba89 --- /dev/null +++ b/sqlite-autoconf-3110100.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 +size 2359545 diff --git a/sqlite-doc-3110000.zip b/sqlite-doc-3110000.zip deleted file mode 100644 index 07e3acc..0000000 --- a/sqlite-doc-3110000.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a942d89d5bf0aa70c0a01267a52961632b27512c293eb6452f6efe909dcec50 -size 5382519 diff --git a/sqlite-doc-3110100.zip b/sqlite-doc-3110100.zip new file mode 100644 index 0000000..62f2544 --- /dev/null +++ b/sqlite-doc-3110100.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 +size 5386958 diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch new file mode 100644 index 0000000..27bbe1e --- /dev/null +++ b/sqlite-fts5-link.patch @@ -0,0 +1,12 @@ +Index: sqlite-autoconf-3110100/Makefile.am +=================================================================== +--- sqlite-autoconf-3110100.orig/Makefile.am ++++ sqlite-autoconf-3110100/Makefile.am +@@ -3,6 +3,7 @@ AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_ + + lib_LTLIBRARIES = libsqlite3.la + libsqlite3_la_SOURCES = sqlite3.c ++libsqlite3_la_LIBADD = -lm + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 diff --git a/sqlite3-link-binary-with-libsqlite3.patch b/sqlite3-link-binary-with-libsqlite3.patch new file mode 100644 index 0000000..444bde8 --- /dev/null +++ b/sqlite3-link-binary-with-libsqlite3.patch @@ -0,0 +1,17 @@ +Index: sqlite-autoconf-3110100/Makefile.am +=================================================================== +--- sqlite-autoconf-3110100.orig/Makefile.am ++++ sqlite-autoconf-3110100/Makefile.am +@@ -6,9 +6,9 @@ libsqlite3_la_SOURCES = sqlite3.c + libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8 + + bin_PROGRAMS = sqlite3 +-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h +-sqlite3_LDADD = @READLINE_LIBS@ +-sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@ ++sqlite3_SOURCES = shell.c sqlite3.h ++sqlite3_LDADD = libsqlite3.la @READLINE_LIBS@ ++sqlite3_DEPENDENCIES = libsqlite3.la @EXTRA_SHELL_OBJ@ + sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS + + include_HEADERS = sqlite3.h sqlite3ext.h diff --git a/sqlite3.changes b/sqlite3.changes index 3dcf579..5fa0bbf 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Mar 7 15:22:53 UTC 2016 - dimstar@opensuse.org + +- Fix sqlite-fts5-link.patch: link libsqlite3.so with libm instead + of the sqlite3 binary: the library is the actual user of log(). +- Add sqlite3-link-binary-with-libsqlite3.patch: dyamically link + /usr/bin/sqlite3 to libsqlite3 instead of statically using it. +- Move autoreconf call to build section, where it belongs. + +------------------------------------------------------------------- +Mon Mar 7 13:53:03 UTC 2016 - idonmez@suse.com + +- Enable FTS5 support. +- Add sqlite-fts5-link.patch to link to math library because FTS5 + code uses log(). + +------------------------------------------------------------------- +Fri Mar 4 18:23:17 UTC 2016 - astieger@suse.com + +- SQLite 3.11.1: + * Fix an FTS5 issue in which the 'optimize' command could cause + index corruption. + * Fix a buffer overread that might occur if FTS5 is used to query + a corrupt database file. + * Increase the maximum "scope" value for the spellfix1 extension + from 6 to 30. + +------------------------------------------------------------------- +Tue Mar 1 16:18:25 UTC 2016 - lnussel@suse.de + +- explicitly enable readline support +- run spec-cleaner + ------------------------------------------------------------------- Thu Feb 18 15:32:46 UTC 2016 - mpluskal@suse.com diff --git a/sqlite3.spec b/sqlite3.spec index 9bebb9d..e38a6c9 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -19,9 +19,9 @@ # Simplify building on RH for Application:Geo (SR#212812). %define pname sqlite3 %define oname sqlite -%define tarversion 3110000 +%define tarversion 3110100 Name: %{pname} -Version: 3.11.0 +Version: 3.11.1 Release: 0 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain @@ -30,11 +30,14 @@ Url: http://www.sqlite.org/ Source0: http://www.sqlite.org/2016/sqlite-autoconf-%{tarversion}.tar.gz Source1: baselibs.conf Source2: http://www.sqlite.org/2016/sqlite-doc-%{tarversion}.zip -# +Patch0: sqlite3-link-binary-with-libsqlite3.patch +Patch1: sqlite-fts5-link.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: unzip -# Requires: libsqlite3-0 = %{version} Provides: %{oname} = %{version} Obsoletes: %{oname} < %{version} @@ -116,27 +119,30 @@ other documentation found on sqlite.org. The files can be found in %prep %setup -q -n sqlite-autoconf-%{tarversion} -a2 +%patch0 -p1 +%patch1 -p1 rm -v sqlite-doc-%{tarversion}/releaselog/current.html ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html %build +autoreconf -fi export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_FTS4 \ + -DSQLITE_ENABLE_FTS5 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_ENABLE_JSON1 \ " -%configure --disable-static -make +%configure --disable-static \ + --enable-readline +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print %post -n libsqlite3-0 -p /sbin/ldconfig - %postun -n libsqlite3-0 -p /sbin/ldconfig - %files %defattr(-,root,root) %{_bindir}/sqlite3