From afc5ebecd0f0ccaaff1abeed52e9c2f5be51b795 Mon Sep 17 00:00:00 2001 From: sailer Date: Thu, 25 Jun 2009 10:18:53 +0000 Subject: [PATCH] update to 3.6.14.2, enable debuginfo --- .cvsignore | 3 +-- mingw32-sqlite.spec | 46 +++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/.cvsignore b/.cvsignore index 07380c4..76aad38 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -sqlite-3.6.6.2.tar.gz -sqlite-3.6.12.tar.gz +sqlite-3.6.14.2.tar.gz diff --git a/mingw32-sqlite.spec b/mingw32-sqlite.spec index 1d3ac38..502bfd8 100644 --- a/mingw32-sqlite.spec +++ b/mingw32-sqlite.spec @@ -1,13 +1,17 @@ -%define __strip %{_mingw32_strip} -%define __objdump %{_mingw32_objdump} -%define _use_internal_dependency_generator 0 -%define __find_requires %{_mingw32_findrequires} -%define __find_provides %{_mingw32_findprovides} +%global __strip %{_mingw32_strip} +%global __objdump %{_mingw32_objdump} +%global _use_internal_dependency_generator 0 +%global __find_requires %{_mingw32_findrequires} +%global __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} +# bcond default logic is nicely backwards... +%bcond_without tcl +%global tclversion 8.5 + Name: mingw32-sqlite -Version: 3.6.12 -Release: 5%{?dist} +Version: 3.6.14.2 +Release: 1%{?dist} Summary: MinGW Windows port of sqlite embeddable SQL database engine License: Public Domain @@ -22,8 +26,7 @@ BuildArch: noarch Patch1: sqlite-3.6.12-libdl.patch # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian Patch2: sqlite-3.6.6.2-lemon-snprintf.patch -Patch3: sqlite-3.6.12-no-sqlite-doc.patch -Patch4: sqlite-3.6.12-memalign.patch +Patch3: sqlite-3.6.13-iotest-nodirsync.patch # Patches for MinGW port. Patch1000: mingw32-sqlite-3.6.12-no-undefined.patch @@ -42,6 +45,11 @@ BuildRequires: /usr/bin/tclsh Requires: pkgconfig +%if %{with tcl} +BuildRequires: /usr/bin/tclsh +BuildRequires: mingw32-tcl +%endif + %description SQLite is a C library that implements an SQL database engine. A large @@ -63,8 +71,7 @@ for Windows. %setup -q -n sqlite-%{version} %patch1 -p1 -b .libdl %patch2 -p1 -b .lemon-sprintf -%patch3 -p1 -b .no-sqlite-doc -%patch4 -p1 -b .align +%patch3 -p1 -b .nodirsync %patch1000 -p1 # Ships with an old/broken version of libtool which cannot create @@ -85,7 +92,10 @@ export config_TARGET_EXEEXT=.exe # add compile flags to enable rtree, fts3 export MINGW32_CFLAGS="%{_mingw32_cflags} -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -fno-strict-aliasing" -%{_mingw32_configure} +%{_mingw32_configure} %{!?with_tcl:--disable-tcl} \ + --enable-threadsafe \ + --enable-threads-override-locks \ + --enable-load-extension make @@ -98,6 +108,10 @@ rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.a chmod 0644 $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.dll.a +%if %{with tcl} +install -d -m755 $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/ +mv $RPM_BUILD_ROOT%{_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl $RPM_BUILD_ROOT%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/ +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -113,10 +127,14 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_includedir}/sqlite3.h %{_mingw32_includedir}/sqlite3ext.h %{_mingw32_libdir}/pkgconfig/sqlite3.pc - +%if %{with tcl} +%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/ +%{_mingw32_datadir}/tcl%{tclversion}/sqlite3/pkgIndex.tcl +%endif %changelog -* Mon Jun 22 2009 Thomas Sailer - 3.6.12-5 +* Tue Jun 23 2009 Thomas Sailer - 3.6.14.2-1 +- update to 3.6.14.2 - add debuginfo packages * Thu Apr 23 2009 Thomas Sailer - 3.6.12-4 diff --git a/sources b/sources index 2211e51..8fc546c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -13600865a69a3f54d2ac42a0d6b743db sqlite-3.6.12.tar.gz +4c074691b48cd45854899ae4fece6301 sqlite-3.6.14.2.tar.gz