diff --git a/sqlite-autoconf-3420000.tar.gz b/sqlite-autoconf-3460100.tar.gz similarity index 30% rename from sqlite-autoconf-3420000.tar.gz rename to sqlite-autoconf-3460100.tar.gz index add41942a78a0d413b0797805b17f1e5cbc32097..8572d3c7a5ccf169af8e105157fffe34781219b7 100644 Binary files a/sqlite-autoconf-3420000.tar.gz and b/sqlite-autoconf-3460100.tar.gz differ diff --git a/sqlite-doc-3420000.zip b/sqlite-doc-3460100.zip similarity index 66% rename from sqlite-doc-3420000.zip rename to sqlite-doc-3460100.zip index bc4fb0c41daa7c74a49c32e3e48b87d0455fa2e9..f5d5cd19d575fb611e891d8f3f83d8bc39e5ae36 100644 Binary files a/sqlite-doc-3420000.zip and b/sqlite-doc-3460100.zip differ diff --git a/sqlite-src-3420000.zip b/sqlite-src-3460100.zip similarity index 76% rename from sqlite-src-3420000.zip rename to sqlite-src-3460100.zip index 241a8532258b1132f7595453e0680afe7e755830..30a04a37cf36773d94445c21b1aaf14f9f7ca1c4 100644 Binary files a/sqlite-src-3420000.zip and b/sqlite-src-3460100.zip differ diff --git a/sqlite.spec b/sqlite.spec index 7fd324b18522722a612aff76c6b9f03d83a71761..571d60816e3bf885ae220b327566c1f424a037c4 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -1,32 +1,31 @@ %bcond_without check -%global extver 3420000 %global tcl_version 8.6 %global tcl_sitearch %{_libdir}/tcl%{tcl_version} Name: sqlite -Version: 3.42.0 +Version: 3.46.1 +%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/ -Source0: https://www.sqlite.org/2023/sqlite-src-%{extver}.zip -Source1: http://www.sqlite.org/2023/sqlite-doc-%{extver}.zip -Source2: https://www.sqlite.org/2023/sqlite-autoconf-%{extver}.tar.gz +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 BuildRequires: gcc autoconf tcl tcl-devel BuildRequires: ncurses-devel readline-devel glibc-devel - -Provides: %{name}-libs -Obsoletes: %{name}-libs -Provides: lemon -Obsoletes: lemon -Provides: %{name}-analyzer -Obsoletes: %{name}-analyzer -Provides: %{name}-tcl -Obsoletes: %{name}-tcl +Provides: %{name}-libs = %{version}-%{release} +Obsoletes: %{name}-libs < %{version}-%{release} +Provides: lemon = %{version}-%{release} +Obsoletes: lemon < %{version}-%{release} +Provides: %{name}-analyzer = %{version}-%{release} +Obsoletes: %{name}-analyzer < %{version}-%{release} +Provides: %{name}-tcl = %{version}-%{release} +Obsoletes: %{name}-tcl < %{version}-%{release} %description SQLite is a C-language library that implements a small, fast, self-contained, @@ -38,7 +37,6 @@ use every day.It also include lemon and sqlite3_analyzer and tcl tools. %package devel Summary: Including header files and library for the developing of sqlite Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig %description devel This contains dynamic libraries and header files for the developing of sqlite. @@ -46,8 +44,8 @@ This contains dynamic libraries and header files for the developing of sqlite. %package help Summary: Man file and documentation for sqlite BuildArch: noarch -Provides: %{name}-doc -Obsoletes: %{name}-doc +Provides: %{name}-doc = %{version}-%{release} +Obsoletes: %{name}-doc < %{version}-%{release} %description help This contains man files and HTML files for the using of sqlite. @@ -71,8 +69,8 @@ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \ %configure --enable-fts5 \ --enable-threadsafe \ - --enable-threads-override-locks \ --enable-load-extension \ + --disable-static \ TCLLIBDIR=%{tcl_sitearch}/sqlite3 # rpath removal @@ -84,7 +82,8 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool %make_build sqlite3_analyzer %install -make DESTDIR=${RPM_BUILD_ROOT} install +%make_install +%delete_la install -D -m 755 lemon %{buildroot}%{_bindir}/lemon install -D -m 644 tool/lempar.c %{buildroot}%{_datadir}/lemon/lempar.c @@ -107,18 +106,15 @@ rm -rf test/thread1.test rm -rf test/thread2.test %endif -make test +%make_build test %endif # with check -%ldconfig_scriptlets - %files %doc README.md %{_bindir}/{sqlite3,lemon,sqlite3_analyzer} %{_libdir}/*.so.* %{_datadir}/lemon %{tcl_sitearch}/sqlite3 -%exclude %{_libdir}/*.{la,a} %files devel %{_includedir}/*.h @@ -130,6 +126,9 @@ make test %{_mandir}/man*/* %changelog +* Tue Aug 13 2024 Funda Wang - 3.46.1-1 +- update to 3.46.1 + * Tue Feb 27 2024 Zheng Zhenyu - 3.42.0-1 - Bump version to fix CVE-2024-0232