Rebase to 3.38.0

- CFLAGS switched to configure options where possible
- remove SQLITE_ENABLE_MATH_FUNCTION, as this is default
- for i686 the atof1.test removed, due to failures, issue is filled in
  upstream. If the issue is fixed upstream, the test can be reenabled.
  Link on the issue: https://www.sqlite.org/forum/forumpost/b6a48b79f9
This commit is contained in:
Zuzana Miklankova 2022-02-23 08:06:20 +01:00
parent f67f322c94
commit 9e13576d40
No known key found for this signature in database
GPG Key ID: 46A18EF4D17103A0
2 changed files with 31 additions and 15 deletions

View File

@ -1,3 +1,3 @@
SHA512 (sqlite-doc-3360000.zip) = c9b5628f823c322688e2fcce0effe7564dccaf8bcdbb3397ee09c433975bfb5fd63fd81830c5c6d573314e1e55d25cdf1b3842d798f7be63b9b88b32f6694add SHA512 (sqlite-src-3380000.zip) = 9f4d3c406df5e6290f3f0b5e24b568723ab54bb085cb8cd7621ab42b0b8cd4f76e9784a4a29b42ea8cb0d1b7d759267c3cd980913d490d08e7172df05949131d
SHA512 (sqlite-src-3360000.zip) = 4083f96265c59001d21dce4d0288ddc6ea80ae079cbce2144c0fc3200b1904fd0d665fc54b08978c6b818527580042cde025c03b73d20d0bc56ccbeb75a330c3 SHA512 (sqlite-doc-3380000.zip) = 8e1f77504a1057cd23a8a6c2a285d63c5df50ceaf6ab84054a6f5422286dd868bdb3d5bd9be180b7834caba2b65ca185ffff60455bb504df30801157b62a62ef
SHA512 (sqlite-autoconf-3360000.tar.gz) = e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0 SHA512 (sqlite-autoconf-3380000.tar.gz) = 30577730e54ac4f83acfe0ff2fac9cb2ba6eb917907d7584f2b18ca852382f2f4ff596e1e1cd4ce41fe90ac271501ee97b5e508b7e5072cda713855aae562d28

View File

@ -4,15 +4,15 @@
%bcond_with static %bcond_with static
%bcond_without check %bcond_without check
%define realver 3360000 %define realver 3380000
%define docver 3360000 %define docver 3380000
%define rpmver 3.36.0 %define rpmver 3.38.0
%define year 2021 %define year 2022
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
Name: sqlite Name: sqlite
Version: %{rpmver} Version: %{rpmver}
Release: 5%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
URL: http://www.sqlite.org/ URL: http://www.sqlite.org/
@ -140,22 +140,33 @@ This package contains the analysis program for %{name}.
%endif %endif
%patch5 -p1 %patch5 -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.
%ifarch == i686
rm test/atof1.test
%endif
# Remove backup-file # Remove backup-file
rm -f %{name}-doc-%{docver}/sqlite.css~ || : rm -f %{name}-doc-%{docver}/sqlite.css~ || :
autoconf # Rerun with new autoconf to add support for aarm64 autoconf # Rerun with new autoconf to add support for aarm64
%build %build
export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \ # following CFLAGS are not possible to set via the configure script
-DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=1 \ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SECURE_DELETE=1 \ -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_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
-DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \ -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
-DSQLITE_ENABLE_FTS4=1 \
-DSQLITE_ENABLE_MATH_FUNCTIONS \
-DSQLITE_ENABLE_DBPAGE_VTAB \ -DSQLITE_ENABLE_DBPAGE_VTAB \
-Wall -fno-strict-aliasing" -Wall -fno-strict-aliasing"
%configure %{!?with_tcl:--disable-tcl} \ %configure %{!?with_tcl:--disable-tcl} \
--enable-rtree \
--enable-json1 \
--enable-fts3 \
--enable-fts4 \ --enable-fts4 \
--enable-fts5 \ --enable-fts5 \
--enable-threadsafe \ --enable-threadsafe \
@ -163,6 +174,7 @@ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
--enable-load-extension \ --enable-load-extension \
%{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
# rpath removal # rpath removal
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool 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 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -258,6 +270,10 @@ make test
%endif %endif
%changelog %changelog
* Thu Mar 03 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.0-1
- Updated to version 3.38.0 (https://sqlite.org/releaselog/3_38_0.html)
- Set flags with configure script, whenever possible
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild