From d3a6ec6503f16c63f3c77fccfdb6284fff57c9e40546bb7242d74917e628cd76 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 6 Jun 2018 18:59:40 +0000 Subject: [PATCH 1/3] Accepting request 614604 from home:AndreasStieger:branches:server:database 3.24.0 OBS-URL: https://build.opensuse.org/request/show/614604 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=207 --- sqlite-autoconf-3230100.tar.gz | 3 --- sqlite-autoconf-3240000.tar.gz | 3 +++ sqlite-doc-3230100.zip | 3 --- sqlite-doc-3240000.zip | 3 +++ sqlite3.changes | 25 +++++++++++++++++++++++++ sqlite3.spec | 13 ++++--------- 6 files changed, 35 insertions(+), 15 deletions(-) delete mode 100644 sqlite-autoconf-3230100.tar.gz create mode 100644 sqlite-autoconf-3240000.tar.gz delete mode 100644 sqlite-doc-3230100.zip create mode 100644 sqlite-doc-3240000.zip diff --git a/sqlite-autoconf-3230100.tar.gz b/sqlite-autoconf-3230100.tar.gz deleted file mode 100644 index eee01a2..0000000 --- a/sqlite-autoconf-3230100.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92842b283e5e744eff5da29ed3c69391de7368fccc4d0ee6bf62490ce555ef25 -size 2675362 diff --git a/sqlite-autoconf-3240000.tar.gz b/sqlite-autoconf-3240000.tar.gz new file mode 100644 index 0000000..8c5e1b6 --- /dev/null +++ b/sqlite-autoconf-3240000.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9d14e88c6fb6d68de9ca0d1f9797477d82fc3aed613558f87ffbdbbc5ceb74a +size 2699252 diff --git a/sqlite-doc-3230100.zip b/sqlite-doc-3230100.zip deleted file mode 100644 index be4fefa..0000000 --- a/sqlite-doc-3230100.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85f936ba6db3540db92f878990d088b10bb453c691fccf05714396a03c813872 -size 8882546 diff --git a/sqlite-doc-3240000.zip b/sqlite-doc-3240000.zip new file mode 100644 index 0000000..3d0a8c8 --- /dev/null +++ b/sqlite-doc-3240000.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77b104df2b57a32c40d0336bbf77ab013a1a95ab49a5fe0ea92250e9f2ae82c1 +size 9030826 diff --git a/sqlite3.changes b/sqlite3.changes index aa3ab59..a26e72c 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Jun 6 16:22:50 UTC 2018 - astieger@suse.com + +- update to 3.24.0: + * Add support for PostgreSQL-style UPSERT + * Add support for auxiliary columns in r-tree tables + * Add C-language APIs for discovering SQL keywords used by SQLite + * Add C-language APIs for dynamic strings based on sqlite3_str + * Enhance ALTER TABLE so that it recognizes "true" and "false" as + valid arguments to DEFAULT + * Add the sorter-reference optimization as a compile-time option + * Improve the format of the EXPLAIN QUERY PLAN raw output, so that + it gives better information about the query plan and about the + relationships between the various components of the plan + * Added the SQLITE_DBCONFIG_RESET_DATABASE option to the + sqlite3_db_config() API. + * Automatically intercept the raw EXPLAIN QUERY PLAN output an + reformat it into an ASCII-art graph. + * Lines that begin with "#" and that are not in the middle of an + SQL statement are interpreted as comments + * Add the --append option to the ".backup" command + * Add the ".dbconfig" command + * various performance improvements + * various bug fixes + ------------------------------------------------------------------- Wed Apr 11 11:40:57 UTC 2018 - astieger@suse.com diff --git a/sqlite3.spec b/sqlite3.spec index 63b82a3..ebe2891 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -17,14 +17,14 @@ %define oname sqlite -%define tarversion 3230100 +%define tarversion 3240000 Name: sqlite3 -Version: 3.23.1 +Version: 3.24.0 Release: 0 Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain Group: Productivity/Databases/Servers -Url: http://www.sqlite.org/ +URL: http://www.sqlite.org/ Source0: http://www.sqlite.org/2018/sqlite-autoconf-%{tarversion}.tar.gz Source1: baselibs.conf Source2: http://www.sqlite.org/2018/sqlite-doc-%{tarversion}.zip @@ -38,7 +38,6 @@ BuildRequires: unzip BuildRequires: pkgconfig(zlib) Provides: %{oname} = %{version} Obsoletes: %{oname} < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SQLite is a C library that implements an embeddable SQL database @@ -142,23 +141,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -n libsqlite3-0 -p /sbin/ldconfig %files -%defattr(-,root,root) %{_bindir}/sqlite3 -%{_mandir}/man1/sqlite3.1%{ext_man} +%{_mandir}/man1/sqlite3.1%{?ext_man} %files -n libsqlite3-0 -%defattr(-,root,root) %{_libdir}/libsqlite3.so.* %files devel -%defattr(-,root,root) %{_includedir}/sqlite3.h %{_includedir}/sqlite3ext.h %{_libdir}/libsqlite3.so %{_libdir}/pkgconfig/sqlite3.pc %files doc -%defattr(-,root,root) %doc sqlite-doc-%{tarversion}/* %changelog From 87fb9593b33f83172ce8c0e88e986290e10da212818433e9d046ddcbf7805ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 7 Jun 2018 11:00:01 +0000 Subject: [PATCH 2/3] Accepting request 614884 from home:Guillaume_G:branches:server:database - Enable SQLITE_ENABLE_UPDATE_DELETE_LIMIT OBS-URL: https://build.opensuse.org/request/show/614884 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=208 --- sqlite3.changes | 5 +++++ sqlite3.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/sqlite3.changes b/sqlite3.changes index a26e72c..deab91c 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 7 09:50:31 UTC 2018 - guillaume.gardet@opensuse.org + +- Enable SQLITE_ENABLE_UPDATE_DELETE_LIMIT + ------------------------------------------------------------------- Wed Jun 6 16:22:50 UTC 2018 - astieger@suse.com diff --git a/sqlite3.spec b/sqlite3.spec index ebe2891..1a0673d 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -123,6 +123,7 @@ export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_JSON1 \ -DSQLITE_ENABLE_RBU \ -DSQLITE_ENABLE_RTREE \ + -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT \ -DSQLITE_SOUNDEX \ -DSQLITE_ENABLE_UNLOCK_NOTIFY \ -DSQLITE_SECURE_DELETE \ From 8d3cb8c1dee9c0b51ef94db15cd96c40b993650d39c2b57997ae73cb8284084e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 11 Jun 2018 14:45:59 +0000 Subject: [PATCH 3/3] Accepting request 615931 from home:Guillaume_G:branches:server:database - Use 'src' archive instead of 'amalgamation' to be able to use some flags, such as SQLITE_ENABLE_UPDATE_DELETE_LIMIT - Remove 'sqlite-fts5-link.patch' since patched file is not availaible in 'src' archive. Add '-lm' flag to LIBS var instead OBS-URL: https://build.opensuse.org/request/show/615931 OBS-URL: https://build.opensuse.org/package/show/server:database/sqlite3?expand=0&rev=209 --- sqlite-autoconf-3240000.tar.gz | 3 --- sqlite-fts5-link.patch | 12 ------------ sqlite-src-3240000.zip | 3 +++ sqlite3.changes | 8 ++++++++ sqlite3.spec | 20 +++++++++++++------- 5 files changed, 24 insertions(+), 22 deletions(-) delete mode 100644 sqlite-autoconf-3240000.tar.gz delete mode 100644 sqlite-fts5-link.patch create mode 100644 sqlite-src-3240000.zip diff --git a/sqlite-autoconf-3240000.tar.gz b/sqlite-autoconf-3240000.tar.gz deleted file mode 100644 index 8c5e1b6..0000000 --- a/sqlite-autoconf-3240000.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9d14e88c6fb6d68de9ca0d1f9797477d82fc3aed613558f87ffbdbbc5ceb74a -size 2699252 diff --git a/sqlite-fts5-link.patch b/sqlite-fts5-link.patch deleted file mode 100644 index 27bbe1e..0000000 --- a/sqlite-fts5-link.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/sqlite-src-3240000.zip b/sqlite-src-3240000.zip new file mode 100644 index 0000000..feb7359 --- /dev/null +++ b/sqlite-src-3240000.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72a302f5ac624079a0aaf98316dddda00063a52053f5ab7651cfc4119e1693a5 +size 10980065 diff --git a/sqlite3.changes b/sqlite3.changes index deab91c..d788188 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 8 14:01:06 UTC 2018 - guillaume.gardet@opensuse.org + +- Use 'src' archive instead of 'amalgamation' to be able to use + some flags, such as SQLITE_ENABLE_UPDATE_DELETE_LIMIT +- Remove 'sqlite-fts5-link.patch' since patched file is not + availaible in 'src' archive. Add '-lm' flag to LIBS var instead + ------------------------------------------------------------------- Thu Jun 7 09:50:31 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/sqlite3.spec b/sqlite3.spec index 1a0673d..dd33773 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -25,15 +25,14 @@ Summary: Embeddable SQL Database Engine License: SUSE-Public-Domain Group: Productivity/Databases/Servers URL: http://www.sqlite.org/ -Source0: http://www.sqlite.org/2018/sqlite-autoconf-%{tarversion}.tar.gz +Source0: http://www.sqlite.org/2018/sqlite-src-%{tarversion}.zip Source1: baselibs.conf Source2: http://www.sqlite.org/2018/sqlite-doc-%{tarversion}.zip -Patch1: sqlite-fts5-link.patch -BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: readline-devel +BuildRequires: tcl BuildRequires: unzip BuildRequires: pkgconfig(zlib) Provides: %{oname} = %{version} @@ -105,14 +104,13 @@ other documentation found on sqlite.org. The files can be found in %{_docdir}/%{name}-doc. %prep -%setup -q -n sqlite-autoconf-%{tarversion} -a2 -%patch1 -p1 +%setup -q -n sqlite-src-%{tarversion} -a2 rm -v sqlite-doc-%{tarversion}/releaselog/current.html ln -sv `echo %{version} | sed "s/\./_/g"`.html sqlite-doc-%{tarversion}/releaselog/current.html find -type f -name sqlite.css~ -delete %build -autoreconf -fiv +export LIBS="$LIBS -lm " export CFLAGS="%{optflags} \ -DSQLITE_ENABLE_API_ARMOR \ -DSQLITE_ENABLE_COLUMN_METADATA \ @@ -131,11 +129,19 @@ export CFLAGS="%{optflags} \ %configure \ --disable-static \ --disable-static-shell \ - --enable-readline + --enable-readline \ + --enable-fts4 \ + --enable-fts5 \ + --enable-json1 \ + --enable-update-limit \ + --enable-rtree +make sqlite3.c make %{?_smp_mflags} %install %make_install +mkdir -p %{buildroot}/%{_mandir}/man1/ +cp sqlite3.1 %{buildroot}/%{_mandir}/man1/ find %{buildroot} -type f -name "*.la" -delete -print %post -n libsqlite3-0 -p /sbin/ldconfig