.fmf/version

@@ -1 +0,0 @@
-1

ci.fmf

@@ -1,10 +0,0 @@
-/test:
-    summary:
-        Basic set of quick tests for sqlite.
-    discover:
-      - name: fedora
-        how: fmf
-        url: "https://src.fedoraproject.org/tests/sqlite.git"
-        ref: main
-    execute:
-        how: tmt

sources

@@ -1,3 +1,3 @@
-SHA512 (sqlite-autoconf-3390200.tar.gz) = c16b50ade3c182d5473014ac0a51e2bb8a5cfc46e532c2bda77ae4d530336e2b57aa4f12dccb6aa2148d60e9289305bf20842ac95dc52f2d31df8eb5f0599de6
-SHA512 (sqlite-src-3390200.zip) = a838386a48654391590ea0e1cb355d29f6f93033c3e582df7c63139adaf5119dd5a1550e913dbad0d3eafb0bfa03c4fc6dc48a334d9c45ffb8a7205a528b38f1
-SHA512 (sqlite-doc-3390200.zip) = 54b9e632244b95ebf35fcaa5ce9c02381601eb442eec2ec2a809a7fe24d2cfed751581bb82fd243aaede2c935864da39fd1f1685e762826dd76fc754c7f79c0b
+SHA512 (sqlite-doc-3360000.zip) = c9b5628f823c322688e2fcce0effe7564dccaf8bcdbb3397ee09c433975bfb5fd63fd81830c5c6d573314e1e55d25cdf1b3842d798f7be63b9b88b32f6694add
+SHA512 (sqlite-src-3360000.zip) = 4083f96265c59001d21dce4d0288ddc6ea80ae079cbce2144c0fc3200b1904fd0d665fc54b08978c6b818527580042cde025c03b73d20d0bc56ccbeb75a330c3
+SHA512 (sqlite-autoconf-3360000.tar.gz) = e59c57f421b4956c7759af528a2da929167e15179ab9d28267474683e2272f93c901203e5a648732f1a3d43e7be3ac4217c3cdd7adf108c378b9127b771a7cd0

sqlite.spec

@@ -4,15 +4,15 @@
 %bcond_with static
 %bcond_without check
 
-%define realver 3390200
-%define docver 3390200
-%define rpmver 3.39.2
-%define year 2022
+%define realver 3360000
+%define docver 3360000
+%define rpmver 3.36.0
+%define year 2021
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: %{rpmver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 URL: http://www.sqlite.org/
 
@@ -33,7 +33,7 @@ Patch4: sqlite-3.16-datetest-2.2c.patch
 Patch5: sqlite-3.18.0-sync2-dirsync.patch
 
 BuildRequires: make
-BuildRequires: gcc
+BuildRequires:  gcc
 BuildRequires: ncurses-devel readline-devel glibc-devel
 BuildRequires: autoconf
 %if %{with tcl}
@@ -140,37 +140,21 @@ This package contains the analysis program for %{name}.
 %endif
 %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
 rm -f %{name}-doc-%{docver}/sqlite.css~ || :
 
-autoupdate
 autoconf # Rerun with new autoconf to add support for aarm64
 
 %build
-# following CFLAGS are not possible to set via the configure script
-export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
-               -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-               -DSQLITE_DISABLE_DIRSYNC=1 \
-               -DSQLITE_SECURE_DELETE=1 \
+export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 \
+               -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=1 \
+               -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_DBPAGE_VTAB \
+               -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 -DSQLITE_ENABLE_JSON1=1 \
+               -DSQLITE_ENABLE_FTS4=1 \
+               -DSQLITE_ENABLE_MATH_FUNCTIONS \
                -Wall -fno-strict-aliasing"
-
-%ifarch == aarch64
-export CFLAGS="$CFLAGS -mbranch-protection=standard"
-%endif
-
 %configure %{!?with_tcl:--disable-tcl} \
-           --enable-rtree \
-           --enable-fts3 \
            --enable-fts4 \
            --enable-fts5 \
            --enable-threadsafe \
@@ -178,7 +162,6 @@ export CFLAGS="$CFLAGS -mbranch-protection=standard"
            --enable-load-extension \
            %{?with_tcl: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
@@ -192,7 +175,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %endif
 
 # Build sqldiff
-%if %{with sqldiff}
+%if %{with tcl}
 %make_build sqldiff
 %endif
 
@@ -211,7 +194,7 @@ install -D -m0755 sqlite3_analyzer $RPM_BUILD_ROOT/%{_bindir}/sqlite3_analyzer
 %endif
 
 # Install sqldiff
-%if %{with sqldiff}
+%if %{with tcl}
 install -D -m0755 sqldiff $RPM_BUILD_ROOT/%{_bindir}/sqldiff
 %endif
 
@@ -274,49 +257,6 @@ make test
 %endif
 
 %changelog
-* Fri Jul 29 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.39.2-1
-- Updated to version 3.39.2 (https://sqlite.org/releaselog/3_39_2.html)
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul 18 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.39.1-1
-- Updated to version 3.39.1 (https://sqlite.org/releaselog/3_39_1.html)
-
-* Mon Jun 27 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.39.0-1
-- Updated to version 3.39.0 (https://sqlite.org/releaselog/3_39_0.html)
-
-* Thu Jun 09 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.5-2
-- Fix build error --without sqldiff
-- Fix typo in changelog
-
-* Mon May 09 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.5-1
-- Updated to version 3.38.5 (https://sqlite.org/releaselog/3_38_5.html)
-
-* Mon May 02 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.3-2
-- add flag -mbranch-protection=standard for aarch64
-- remove configure flag --enable-json1, as this is default from 3.38.0
-- run autoupdate before autoconf in %prep
-
-* Thu Apr 28 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.3-1
-- Updated to version 3.38.3 (https://sqlite.org/releaselog/3_38_3.html)
-
-* Thu Apr 07 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.2-1
-- Updated to version 3.38.2 (https://sqlite.org/releaselog/3_38_2.html)
-
-* Wed Mar 23 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.38.1-1
-- Updated to version 3.38.1 (https://sqlite.org/releaselog/3_38_1.html)
-
-* 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
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Aug 18 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.36.0-4
-- Enabled SQLITE_DBPAGE virtual table (#1973454)
-
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

tests/basic/Makefile

@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/sqlite3/Sanity/basic
+#   Description: Basic test for python and sqlite3 DB
+#   Author: Branislav Nater <bnater@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/sqlite3/Sanity/basic
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE sqlite3-test.py
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Branislav Nater <bnater@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Basic test for python and sqlite DB" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          sqlite3" >> $(METADATA)
+	@echo "Requires:        python sqlite" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+
+	rhts-lint $(METADATA)

tests/basic/PURPOSE

@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/sqlite3/Sanity/basic
+Description: Basic test for python and sqlite3 DB
+Author: Branislav Nater <bnater@redhat.com>

tests/basic/runtest.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/sqlite3/Sanity/basic
+#   Description: Basic test for python and sqlite3 DB
+#   Author: Branislav Nater <bnater@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGES=${PACKAGES:-"python2 sqlite"}
+REQUIRES=${REQUIRES:-sqlite}
+PYTHON=${PYTHON:-python}
+
+rlJournalStart
+  rlPhaseStartSetup
+    rlAssertRpm --all
+    rlAssertBinaryOrigin $PYTHON
+    rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+    rlRun "cp sqlite3-test.py $TmpDir" 0 "Copy test script to $TmpDir"
+    rlRun "pushd $TmpDir"
+  rlPhaseEnd
+
+  rlGetTestState && {
+    rlPhaseStartTest
+        rlRun "$PYTHON sqlite3-test.py"
+    rlPhaseEnd
+  }
+
+  rlPhaseStartCleanup
+    rlRun "popd"
+    rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+  rlPhaseEnd
+rlJournalEnd
+rlJournalPrintText

tests/basic/sqlite3-test.py

@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+import sqlite3
+import sys
+
+conn = None
+
+try:
+    conn = sqlite3.connect('test.db')
+
+    cur = conn.cursor()
+
+    cur.execute('SELECT SQLITE_VERSION()')
+    ver = cur.fetchone()
+    print("SQLite version: %s" % ver)
+
+    # Create a new table 'Writers'
+    cur.execute("CREATE TABLE Writers(Id INTEGER PRIMARY KEY AUTOINCREMENT, \
+             Name VARCHAR(25))")
+    cur.execute("INSERT INTO Writers(Name) VALUES('Jack London')")
+    cur.execute("INSERT INTO Writers(Name) VALUES('Honore de Balzac')")
+    cur.execute("INSERT INTO Writers(Name) VALUES('Lion Feuchtwanger')")
+
+    # Retrieve data
+    for row in cur.execute("SELECT * FROM Writers"):
+        print(row)
+
+    cur.execute("DROP TABLE Writers")
+
+except (sqlite3.Error) as e:
+    print("Error %s:" % e.args[0])
+    sys.exit(1)
+
+finally:
+
+    if conn:
+        conn.close()

tests/tests.yml

@@ -0,0 +1,16 @@
+---
+# Tests to run in a classic environment
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    - container
+    tests:
+    - basic
+    required_packages:
+    - findutils         # beakerlib needs find command
+    - which
+    - python2
+    - sqlite
+