automatic import of sqliteopeneuler24.03_LTS

7 files changed, 37 insertions, 161 deletions

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-Add-DESTDIR-support-to-the-tclextension-install-target.patch b/sqlite-Add-DESTDIR-support-to-the-tclextension-install-target.patch
deleted file mode 100644
index 1b04d25..0000000
--- a/sqlite-Add-DESTDIR-support-to-the-tclextension-install-target.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Index: Makefile.in
-==================================================================
---- Makefile.in
-+++ Makefile.in
-@@ -1598,11 +1598,11 @@
- 
- # Install the SQLite TCL extension in a way that is appropriate for $TCLSH_CMD
- # to find it.
- #
- tclextension-install:	tclsqlite3.c
--	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
-+	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --destdir "$(DESTDIR)" --cc "$(CC)" $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
- 
- # Install the SQLite TCL extension that is used by $TCLSH_CMD
- #
- tclextension-uninstall: 
- 	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --uninstall
-
-Index: tool/buildtclext.tcl
-==================================================================
---- tool/buildtclext.tcl
-+++ tool/buildtclext.tcl
-@@ -15,6 +15,7 @@
-    --info               Show info on existing SQLite TCL extension installs
-    --install-only       Install an extension previously build
-    --uninstall          Uninstall the extension
-+   --destdir DIR        Installation root (used by "make install DESTDIR=...")
- 
- Other options are retained and passed through into the compiler.}
- 
-@@ -25,6 +26,7 @@
- set infoonly 0
- set CC {}
- set OPTS {}
-+set DESTDIR ""; # --destdir "$(DESTDIR)"
- for {set ii 0} {$ii<[llength $argv]} {incr ii} {
-   set a0 [lindex $argv $ii]
-   if {$a0=="--install-only"} {
-@@ -42,6 +44,9 @@
-   } elseif {$a0=="--cc" && $ii+1<[llength $argv]} {
-     incr ii
-     set CC [lindex $argv $ii]
-+  } elseif {$a0=="--destdir" && $ii+1<[llength $argv]} {
-+    incr ii
-+    set DESTDIR [lindex $argv $ii]
-   } elseif {[string match -* $a0]} {
-     append OPTS " $a0"
-   } else {
-@@ -245,7 +250,7 @@
- 
- if {$install} {
-   # Install the extension
--  set DEST2 $DEST/sqlite$VERSION
-+  set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
-   file mkdir $DEST2
-   puts "installing $DEST2/pkgIndex.tcl"
-   file copy -force pkgIndex.tcl $DEST2
-Index: tool/buildtclext.tcl
-==================================================================
---- tool/buildtclext.tcl
-+++ tool/buildtclext.tcl
-@@ -196,11 +196,19 @@
-   # Figure out where the extension will be installed.  Put the extension
-   # in the first writable directory on $auto_path.
-   #
-   set DEST {}
-   foreach dir $auto_path {
--    if {[file writable $dir]} {
-+    if {[string match //*:* $dir]} {
-+      # We can't install to //zipfs: paths
-+      continue
-+    } elseif {"" ne $DESTDIR && ![file writable $DESTDIR]} {
-+      continue
-+    }
-+    set dir ${DESTDIR}$dir
-+    if {[file writable $dir] || "" ne $DESTDIR} {
-+      # the dir will be created later ^^^^^^^^
-       set DEST $dir
-       break
-     } elseif {[glob -nocomplain $dir/sqlite3*/pkgIndex.tcl]!=""} {
-       set conflict [lindex [glob $dir/sqlite3*/pkgIndex.tcl] 0]
-       puts "Unable to install. There is already a conflicting version"
-@@ -214,11 +222,11 @@
-     puts "None of the directories on \$auto_path are writable by this process,"
-     puts "so the installation cannot take place.  Consider running using sudo"
-     puts "to work around this problem.\n"
-     puts "These are the (unwritable) \$auto_path directories:\n"
-     foreach dir $auto_path {
--      puts "  *  $dir"
-+      puts "  *  ${DESTDIR}$dir"
-     }
-     exit 1
-   }
- }
- 
-@@ -248,12 +256,12 @@
- }
- 
- 
- if {$install} {
-   # Install the extension
--  set DEST2 ${DESTDIR}$DEST/sqlite$VERSION
-+  set DEST2 $DEST/sqlite$VERSION
-   file mkdir $DEST2
-   puts "installing $DEST2/pkgIndex.tcl"
-   file copy -force pkgIndex.tcl $DEST2
-   puts "installing $DEST2/$OUT"
-   file copy -force $OUT $DEST2
- }
-
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-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-drop-tcl-at-sign.patch b/sqlite-drop-tcl-at-sign.patch
deleted file mode 100644
index a19d9d0..0000000
--- a/sqlite-drop-tcl-at-sign.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: tool/buildtclext.tcl
-==================================================================
---- tool/buildtclext.tcl
-+++ tool/buildtclext.tcl
-@@ -105,11 +105,11 @@
-   #
-   #puts "using $LIBDIR/tclConfig.sh"
-   set fd [open $LIBDIR/tclConfig.sh rb]
-   set tclConfig [read $fd]
-   close $fd
--  
-+
-   # Extract parameter we will need from the tclConfig.sh file
-   #
-   set TCLMAJOR 8
-   regexp {TCL_MAJOR_VERSION='(\d)'} $tclConfig all TCLMAJOR
-   set SUFFIX so
-@@ -138,18 +138,21 @@
-   regexp {TCL_SHLIB_LD='([^']+)'} $tclConfig all cmd
-   set LDFLAGS "$INC -DUSE_TCL_STUBS"
-   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/0683a49cb02f31a1
-+              # in which Gentoo edits their tclConfig.sh to include an soname
-+              # linker flag which includes ${@} (the target file's name).
-+  set CMD [subst $cmd]
- }
--  
-+
- # Show information about prior installs
- #
- if {$infoonly} {
-   set cnt 0
-   foreach dir $auto_path {
-
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 d6c314a..1cfe00d 100644
--- a/sqlite.spec
+++ b/sqlite.spec
@@ -1,18 +1,17 @@
 %bcond_without check
 
 Name:    sqlite
-Version: 3.47.0
+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-drop-tcl-at-sign.patch
-Patch1:  sqlite-Add-DESTDIR-support-to-the-tclextension-install-target.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: ncurses-devel readline-devel glibc-devel
@@ -54,7 +53,7 @@ This contains man files and HTML files for the using of sqlite.
 %prep
 #autosetup will fail because of 2 zip files
 %setup -q -a1 -n %{name}-src-%{extver}
-%autopatch -p0
+%autopatch -p1
 
 rm -f %{name}-doc-%{extver}/sqlite.css~ || :
 
@@ -118,7 +117,7 @@ rm -rf test/thread2.test
 %{_bindir}/{sqlite3,lemon,sqlite3_analyzer}
 %{_libdir}/*.so.*
 %{_datadir}/lemon
-%{tcl_sitearch}/sqlite3%{version}
+%{tcl_sitearch}/sqlite%{version}
 
 %files devel
 %{_includedir}/*.h
@@ -130,6 +129,15 @@ rm -rf test/thread2.test
 %{_mandir}/man*/*
 
 %changelog
+* Tue Jan 14 2025 Funda Wang <fundawang@yeah.net> - 3.48.0-1
+- update to 3.48.0
+
+* Sun Dec 08 2024 Funda Wang <fundawang@yeah.net> - 3.47.2-1
+- update to 3.47.2
+
+* Tue Nov 26 2024 Funda Wang <fundawang@yeah.net> - 3.47.1-1
+- update to 3.47.1
+
 * Tue Oct 22 2024 Funda Wang <fundawang@yeah.net> - 3.47.0-1
 - update to 3.47.0