sqlite3-3.46.0-1

s/sqlite3/sqlite3-vl.spec

@@ -1,14 +1,18 @@
+%ifarch x86_64
+%bcond_without test
+%else
+%bcond_with test
+%endif
+
 %define packagename sqlite3
 %define archivename sqlite
 %define tclver 8.6
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define with_check %{?_with_check:1}%{!?_with_check:0}
-
 %define year 2024
-%define realver 3450300
-%define docver 3450300
-%define rpmver 3.45.3
+%define realver 3460000
+%define docver 3460000
+%define rpmver 3.46.0
 
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
@@ -26,19 +30,9 @@ Source1: https://www.sqlite.org/%{year}/%{archivename}-doc-%{docver}.zip
 
 # Support a system-wide lemon template
 Patch1: sqlite-3.34.1-lemon-system-template.patch
-# sqlite >= 3.7.10 is buggy if malloc_usable_size() is detected, disable it:
-# https://bugzilla.redhat.com/show_bug.cgi?id=801981
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665363
-Patch3: sqlite-3.12.2-no-malloc-usable-size.patch
-# Temporary workaround for failed percentile test, see patch for details
-Patch4: sqlite-3.8.0-percentile-test.patch
-# Disable test date-2.2c on i686
-Patch7: sqlite-3.16-datetest-2.2c.patch
-# Modify sync2.test to pass with DIRSYNC turned off
-Patch8: sqlite-3.18.0-sync2-dirsync.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: tcl-devel, libedit-devel, ncurses-devel, zlib-devel
+BuildRequires: tcl-devel, libedit-devel, ncurses-devel, pkgconfig(zlib)
 
 %description
 SQLite is a C library that implements an embeddable SQL database engine.
@@ -151,37 +145,45 @@ sqlite3-develはSQLiteデータベースライブラリを用いるプログラ
 %prep
 %setup -q -a1 -n%{archivename}-src-%{realver}
 %patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%ifarch %{ix86}
-%patch7 -p1
+
+# The atof test is failing on the i686 architecture, when binary configured with
+# --enable-rtree option. Failing part is text->real conversion and
+# text->real->text conversion in lower significant values after decimal point in a number.
+# func4 tests fail for i686 on float<->int conversions.
+%ifarch == i686
+rm test/atof1.test
+rm test/func4.test
 %endif
-%patch8 -p1
 
 # Remove backup-file
 rm -f %{name}-doc-%{docver}/sqlite.css~ || :
 
+autoupdate
+autoconf
+
 
 %build
-autoconf
-export CFLAGS="$RPM_OPT_FLAGS 
-               -DSQLITE_ENABLE_COLUMN_METADATA=1 
-	       -DSQLITE_DISABLE_DIRSYNC=1 
-	       -DSQLITE_ENABLE_FTS3=1
-	       -DSQLITE_ENABLE_FTS3_PARENTHESIS=1
-	       -DSQLITE_ENABLE_FTS4=1
-	       -DSQLITE_ENABLE_JSON1=1
-	       -DSQLITE_ENABLE_MATH_FUNCTIONS \
-	       -DSQLITE_ENABLE_RTREE=1
-	       -DSQLITE_SECURE_DELETE=1
-	       -DSQLITE_ENABLE_UNLOCK_NOTIFY=1
-	       -DSQLITE_ENABLE_DBSTAT_VTAB=1
-	       -Wall -fno-strict-aliasing"
-%configure --enable-load-extension \
+export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
+               -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+               -DSQLITE_DISABLE_DIRSYNC=1 \
+               -DSQLITE_SECURE_DELETE=1 \
+               -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 \
+               -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
+               -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
+               -DSQLITE_ENABLE_DBPAGE_VTAB \
+               -Wall -fno-strict-aliasing"
+%configure \
+           --enable-load-extension \
            --enable-threadsafe \
+           --enable-fts3 \
            --enable-fts4 \
            --enable-fts5 \
-	   --enable-threads-override-locks
+           --enable-rtree \
+           --enable-threads-override-locks
+
+# rpath removal
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
@@ -199,9 +201,19 @@ install -D -m0755 lemon $RPM_BUILD_ROOT/%{_bindir}/lemon
 install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 
+%if %{with test}
 %check
-%if %{with_check}
-%{__make} test
+# XXX shell tests are broken due to loading system libsqlite3, work around...
+export LD_LIBRARY_PATH=`pwd`/.libs
+export MALLOC_CHECK_=3
+
+# csv01 hangs on all non-intel archs i've tried
+%ifarch x86_64 %{ix86}
+%else
+rm test/csv01.test
+%endif
+
+make test
 %endif
 
 
@@ -243,7 +255,11 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 
 %changelog
+* Sat Jun 29 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.46.0-1
+- new upstream release.
+
 * Thu May 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.45.3-1
+- new upstream release.
 
 * Thu May 18 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.42.0-1
 - new upstream release.