rpms/sqlite/devel sqlite-3.6.12-libdl.patch, NONE, 1.1 sqlite-3.6.12-no-sqlite-doc.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 sources, 1.24, 1.25 sqlite.spec, 1.53, 1.54 sqlite-3.6.10-keywords.patch, 1.1, NONE sqlite-3.6.6.2-libdl.patch, 1.1, NONE

Fri Apr 3 09:49:57 UTC 2009

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24228

Modified Files:
	.cvsignore sources sqlite.spec 
Added Files:
	sqlite-3.6.12-libdl.patch sqlite-3.6.12-no-sqlite-doc.patch 
Removed Files:
	sqlite-3.6.10-keywords.patch sqlite-3.6.6.2-libdl.patch 
Log Message:
- update to 3.6.12 (#492662)
- remove reference to non-existent sqlite-doc from manual (#488883)
- drop unused patches


sqlite-3.6.12-libdl.patch:

--- NEW FILE sqlite-3.6.12-libdl.patch ---
diff -up sqlite-3.6.4/configure.ac.orig sqlite-3.6.4/configure.ac
--- sqlite-3.6.4/configure.ac.orig	2008-11-08 11:37:15.000000000 +0200
+++ sqlite-3.6.4/configure.ac	2008-11-08 11:35:50.000000000 +0200
@@ -606,6 +606,7 @@ AC_ARG_ENABLE(load-extension, AC_HELP_ST
       [use_loadextension=$enableval],[use_loadextension=no])
 if test "${use_loadextension}" = "yes" ; then
   OPT_FEATURE_FLAGS=""
+  AC_SEARCH_LIBS(dlopen, [dl])
 else
   OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

sqlite-3.6.12-no-sqlite-doc.patch:

--- NEW FILE sqlite-3.6.12-no-sqlite-doc.patch ---
diff -up sqlite-3.6.12/sqlite3.1.no-sqlite-doc sqlite-3.6.12/sqlite3.1
--- sqlite-3.6.12/sqlite3.1.no-sqlite-doc	2009-04-03 12:37:35.000000000 +0300
+++ sqlite-3.6.12/sqlite3.1	2009-04-03 12:37:44.000000000 +0300
@@ -221,8 +221,6 @@ o All other command line options are pro
 
 .SH SEE ALSO
 http://www.sqlite.org/
-.br
-The sqlite-doc package
 .SH AUTHOR
 This manual page was originally written by Andreas Rottmann
 <rotty at debian.org>, for the Debian GNU/Linux system (but may be used


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	22 Jan 2009 07:37:44 -0000	1.24
+++ .cvsignore	3 Apr 2009 09:49:27 -0000	1.25
@@ -1 +1 @@
-sqlite-3.6.10.tar.gz
+sqlite-3.6.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	22 Jan 2009 07:37:44 -0000	1.24
+++ sources	3 Apr 2009 09:49:27 -0000	1.25
@@ -1 +1 @@
-a03bdc86df4025b6881d58557e4b5bd3  sqlite-3.6.10.tar.gz
+13600865a69a3f54d2ac42a0d6b743db  sqlite-3.6.12.tar.gz


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sqlite.spec	26 Feb 2009 02:37:01 -0000	1.53
+++ sqlite.spec	3 Apr 2009 09:49:27 -0000	1.54
@@ -5,18 +5,17 @@
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
-Version: 3.6.10
-Release: 4%{?dist}
+Version: 3.6.12
+Release: 1%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
 Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
 # Fix build with --enable-load-extension, upstream ticket #3137
-Patch1: sqlite-3.6.6.2-libdl.patch
+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
-# Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=6186
-Patch3: sqlite-3.6.10-keywords.patch
+Patch3: sqlite-3.6.12-no-sqlite-doc.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel readline-devel glibc-devel
 %if %{with tcl}
@@ -77,14 +76,16 @@
 %setup -q
 %patch1 -p1 -b .libdl
 %patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .keywords
+%patch3 -p1 -b .no-sqlite-doc
 
 %build
+autoconf
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1 -Wall"
 %configure %{!?with_tcl:--disable-tcl} \
            --enable-threadsafe \
            --enable-threads-override-locks \
-           --enable-load-extension 
+           --enable-load-extension \
+	   %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
 
 make %{?_smp_mflags}
 make doc
@@ -92,7 +93,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=${RPM_BUILD_ROOT} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}} install
+make DESTDIR=${RPM_BUILD_ROOT} install
 
 install -D -m0644 sqlite3.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite3.1
 install -D -m0755 lemon $RPM_BUILD_ROOT/%{_bindir}/lemon
@@ -148,6 +149,10 @@
 %endif
 
 %changelog
+* Fri Apr 03 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.12-1
+- update to 3.6.12 (#492662)
+- remove reference to non-existent sqlite-doc from manual (#488883)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- sqlite-3.6.10-keywords.patch DELETED ---


--- sqlite-3.6.6.2-libdl.patch DELETED ---


