rpms/mingw32-sqlite/devel .cvsignore, 1.5, 1.6 mingw32-sqlite.spec, 1.11, 1.12 sources, 1.5, 1.6

[sailer]

Author: sailer

Update of /cvs/extras/rpms/mingw32-sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21560

Modified Files:
	.cvsignore mingw32-sqlite.spec sources 
Log Message:
update to 3.6.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	20 Sep 2009 00:00:11 -0000	1.5
+++ .cvsignore	5 Dec 2009 15:12:06 -0000	1.6
@@ -1,2 +1,3 @@
 sqlite-3.6.14.2.tar.gz
 sqlite-3.6.17.tar.gz
+sqlite-3.6.20.tar.gz


Index: mingw32-sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/mingw32-sqlite.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mingw32-sqlite.spec	20 Sep 2009 00:00:11 -0000	1.11
+++ mingw32-sqlite.spec	5 Dec 2009 15:12:06 -0000	1.12
@@ -6,11 +6,11 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 # bcond default logic is nicely backwards...
-%bcond_without tcl
+%bcond_with tcl
 %global tclversion 8.5
 
 Name:           mingw32-sqlite
-Version:        3.6.17
+Version:        3.6.20
 Release:        1%{?dist}
 Summary:        MinGW Windows port of sqlite embeddable SQL database engine
 
@@ -26,7 +26,6 @@ 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.13-iotest-nodirsync.patch
 
 # Patches for MinGW port.
 Patch1000:      mingw32-sqlite-3.6.12-no-undefined.patch
@@ -71,7 +70,6 @@ for Windows.
 %setup -q -n sqlite-%{version}
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .nodirsync
 %patch1000 -p1
 
 # Ships with an old/broken version of libtool which cannot create
@@ -96,6 +94,12 @@ export MINGW32_CFLAGS="%{_mingw32_cflags
            --enable-threadsafe \
            --enable-threads-override-locks \
            --enable-load-extension
+
+# -lc hack
+sed -e s,build_libtool_need_lc=yes,build_libtool_need_lc=no, < libtool > libtool.x
+mv libtool.x libtool
+chmod a+x libtool
+
 make
 
 
@@ -108,6 +112,8 @@ rm $RPM_BUILD_ROOT%{_mingw32_libdir}/lib
 
 chmod 0644 $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3.dll.a
 
+mv $RPM_BUILD_ROOT%{_mingw32_libdir}/libsqlite3-0.dll $RPM_BUILD_ROOT%{_mingw32_bindir}/
+
 %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/
@@ -122,6 +128,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc README VERSION
 %{_mingw32_bindir}/sqlite3.exe
 %{_mingw32_bindir}/libsqlite3-0.dll
+#%{_mingw32_bindir}/libsqlite3-0.dll.debug
 %{_mingw32_libdir}/libsqlite3.dll.a
 %{_mingw32_libdir}/libsqlite3.la
 %{_mingw32_includedir}/sqlite3.h
@@ -133,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Dec  5 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.20-1
+- update to 3.6.20
+
 * Sun Sep 20 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 3.6.17-1
 - update to 3.6.17
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-sqlite/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	20 Sep 2009 00:00:11 -0000	1.5
+++ sources	5 Dec 2009 15:12:06 -0000	1.6
@@ -1 +1 @@
-f89f62afc765e08b3f0e47cdc47a15d4  sqlite-3.6.17.tar.gz
+0faf8fc8ccff5297513c6532b2b4ce23  sqlite-3.6.20.tar.gz