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