diff --git a/.gitattributes b/.gitattributes index f072cda..339d064 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ *.zip filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/sqlite-3.47.1-buildtclext.patch b/sqlite-3.47.1-buildtclext.patch deleted file mode 100644 index 29cf5e6..0000000 --- a/sqlite-3.47.1-buildtclext.patch +++ /dev/null @@ -1,33 +0,0 @@ -# https://sqlite.org/forum/forumpost/0683a49cb02f31a1 -# https://bugs.gentoo.org/942918 -# Compiled from https://sqlite.org/forum/forumpost/6fd4ca69e86eafc6, https://www.sqlite.org/src/info/38136b33f9536b63 and https://www.sqlite.org/src/info/2f6e5946cf34e094 - ---- a/tool/buildtclext.tcl -+++ b/tool/buildtclext.tcl -@@ -140,12 +140,13 @@ - if {[string length $OPTS]>1} { - append LDFLAGS $OPTS - } -- set CMD [subst $cmd] - if {$TCLMAJOR>8} { - set OUT libtcl9sqlite$VERSION.$SUFFIX - } else { - set OUT libsqlite$VERSION.$SUFFIX - } -+ set @ $OUT; # workaround for https://sqlite.org/forum/forumpost/6b1af7eb10884373 -+ set CMD [subst $cmd] - } - - # Show information about prior installs - ---- a/tool/buildtclext.tcl 2024-11-18 14:01:05.040080030 +0800 -+++ b/tool/buildtclext.tcl 2024-11-18 14:01:27.998394871 +0800 -@@ -232,7 +232,7 @@ - - # Generate and execute the command with which to do the compilation. - # -- set cmd "$CMD tclsqlite3.c -o $OUT $LIBS" -+ set cmd "$CMD tclsqlite3.c -o $OUT $LIBS -lm" - puts $cmd - file delete -force $OUT - catch {exec {*}$cmd} errmsg diff --git a/sqlite-3.48.0-buildtclext.patch b/sqlite-3.48.0-buildtclext.patch new file mode 100644 index 0000000..441b679 --- /dev/null +++ b/sqlite-3.48.0-buildtclext.patch @@ -0,0 +1,11 @@ +--- a/tool/buildtclext.tcl 2024-11-18 14:01:05.040080030 +0800 ++++ b/tool/buildtclext.tcl 2024-11-18 14:01:27.998394871 +0800 +@@ -232,7 +232,7 @@ + + # Generate and execute the command with which to do the compilation. + # +- set cmd "$CMD tclsqlite3.c -o $OUT $LIBS" ++ set cmd "$CMD tclsqlite3.c -o $OUT $LIBS -lm" + puts $cmd + file delete -force $OUT + catch {exec {*}$cmd} errmsg diff --git a/sqlite-autoconf-3470100.tar.gz b/sqlite-autoconf-3470100.tar.gz deleted file mode 100644 index 2c35a98..0000000 Binary files a/sqlite-autoconf-3470100.tar.gz and /dev/null differ diff --git a/sqlite-autoconf-3470200.tar.gz b/sqlite-autoconf-3470200.tar.gz deleted file mode 100644 index 8ce3c5a..0000000 Binary files a/sqlite-autoconf-3470200.tar.gz and /dev/null differ diff --git a/sqlite-autoconf-3480000.tar.gz b/sqlite-autoconf-3480000.tar.gz new file mode 100644 index 0000000..e00a212 --- /dev/null +++ b/sqlite-autoconf-3480000.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 +size 3337615 diff --git a/sqlite-doc-3470200.zip b/sqlite-doc-3470200.zip deleted file mode 100644 index 3672b9e..0000000 --- a/sqlite-doc-3470200.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dcca89a6749029fba81bc0f4188cbd4f78acb48d6a3eadc6d548af9117c3f41 -size 10957830 diff --git a/sqlite-doc-3480000.zip b/sqlite-doc-3480000.zip new file mode 100644 index 0000000..a8885ee --- /dev/null +++ b/sqlite-doc-3480000.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dc137fcd7c6acb326af60a61b9844dd15d3773cb05e7a9ce276c41f713d765a +size 11391112 diff --git a/sqlite-src-3470200.zip b/sqlite-src-3470200.zip deleted file mode 100644 index 055d7b8..0000000 --- a/sqlite-src-3470200.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6a471f1238225f34c2c48c5601b54024cc538044368230f59ff0672be1fc623 -size 14421983 diff --git a/sqlite-src-3480000.zip b/sqlite-src-3480000.zip new file mode 100644 index 0000000..503ed3c --- /dev/null +++ b/sqlite-src-3480000.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7b032b6fdfe8c442aa809f850687a81d06381deecd7be3312601d28612e640 +size 14350897 diff --git a/sqlite.spec b/sqlite.spec index f96ecee..7879c25 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -1,19 +1,19 @@ %bcond_without check Name: sqlite -Version: 3.47.2 +Version: 3.48.0 %global extver %(echo %{version} |awk -F. '{printf "%d%02d%02d00", $1,$2,$3}') Release: 1 Summary: Embeded SQL database License: Public Domain -URL: http://www.sqlite.org/ +URL: https://www.sqlite.org/ -Source0: https://www.sqlite.org/2024/sqlite-src-%{extver}.zip -Source1: http://www.sqlite.org/2024/sqlite-doc-%{extver}.zip -Source2: https://www.sqlite.org/2024/sqlite-autoconf-%{extver}.tar.gz -Patch0: sqlite-3.47.1-buildtclext.patch +Source0: https://www.sqlite.org/2025/sqlite-src-%{extver}.zip +Source1: https://www.sqlite.org/2025/sqlite-doc-%{extver}.zip +Source2: https://www.sqlite.org/2025/sqlite-autoconf-%{extver}.tar.gz +Patch0: sqlite-3.48.0-buildtclext.patch -BuildRequires: gcc autoconf tcl tcl-devel +BuildRequires: gcc tcl tcl-devel BuildRequires: ncurses-devel readline-devel glibc-devel BuildRequires: rpm_macro(tcl_sitearch) @@ -58,32 +58,26 @@ This contains man files and HTML files for the using of sqlite. rm -f %{name}-doc-%{extver}/sqlite.css~ || : %build - -autoconf export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 \ -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \ -Wall -fno-strict-aliasing" - -%configure --enable-fts5 \ +export CC=%{__cc} +%configure --fts5 \ --enable-threadsafe \ --enable-load-extension \ --disable-static \ TCLLIBDIR=%{tcl_sitearch}/sqlite3 -# 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_build %make_build sqlite3_analyzer %install mkdir -p %{buildroot}/%{tcl_sitearch}/sqlite3 -%make_install +%make_install TCLLIBDIR=%{tcl_sitearch}/sqlite3 %delete_la install -D -m 755 lemon %{buildroot}%{_bindir}/lemon @@ -91,10 +85,6 @@ install -D -m 644 tool/lempar.c %{buildroot}%{_datadir}/lemon/lempar.c install -D -m 644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1 install -D -m 755 sqlite3_analyzer %{buildroot}%{_bindir}/sqlite3_analyzer -mkdir -p %{buildroot}%{tcl_sitearch} -mv %{buildroot}%{tcl_sitelib}/sqlite%{version} %{buildroot}%{tcl_sitearch} -chmod 755 %{buildroot}/%{tcl_sitearch}/sqlite%{version}/*.so - %if %{with check} %check export LD_LIBRARY_PATH=`pwd`/.libs @@ -117,7 +107,7 @@ rm -rf test/thread2.test %{_bindir}/{sqlite3,lemon,sqlite3_analyzer} %{_libdir}/*.so.* %{_datadir}/lemon -%{tcl_sitearch}/sqlite%{version} +%{tcl_sitearch}/sqlite3 %files devel %{_includedir}/*.h @@ -129,6 +119,9 @@ rm -rf test/thread2.test %{_mandir}/man*/* %changelog +* Tue Jan 14 2025 Funda Wang - 3.48.0-1 +- update to 3.48.0 + * Sun Dec 08 2024 Funda Wang - 3.47.2-1 - update to 3.47.2