OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Feb-2007 21:18:12
Branch: OPENPKG_2_STABLE Handle: 2007022320181100
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
MFC: fix %preun/%post scripts and upgrade to latest versions
Summary:
Revision Changes Path
1.12.2.2 +48 -21 openpkg-src/sqlite/sqlite.patch
1.113.2.4 +8 -8 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.12.2.1 -r1.12.2.2 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 22 Dec 2006 19:13:37 -0000 1.12.2.1
+++ openpkg-src/sqlite/sqlite.patch 23 Feb 2007 20:18:11 -0000 1.12.2.2
@@ -13,9 +13,21 @@
#########
# Figure out whether or not we have a "usleep()" function.
-Index: sqlite-3.3.8/Makefile.in
---- sqlite-3.3.8/Makefile.in.orig 2006-10-03 14:40:42 +0200
-+++ sqlite-3.3.8/Makefile.in 2006-12-18 09:51:03 +0100
+Index: sqlite-2.8.17/src/encode.c
+--- sqlite-2.8.17/src/encode.c.orig 2005-04-24 00:43:22 +0200
++++ sqlite-2.8.17/src/encode.c 2007-02-23 15:28:03 +0100
+@@ -176,6 +176,8 @@
+ int i, e;
+ unsigned char c;
+ e = *(in++);
++ if (e == 0)
++ return 0;
+ i = 0;
+ while( (c = *(in++))!=0 ){
+ if( c==1 ){
+Index: sqlite-3.3.13/Makefile.in
+--- sqlite-3.3.13/Makefile.in.orig 2006-10-03 14:40:42 +0200
++++ sqlite-3.3.13/Makefile.in 2006-12-18 09:51:03 +0100
@@ -132,6 +132,12 @@
vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
where.lo utf.lo legacy.lo vtab.lo
@@ -44,9 +56,9 @@
fulltest: testfixture$(TEXE) sqlite3$(TEXE)
./testfixture $(TOP)/test/all.test
-Index: sqlite-3.3.8/configure
---- sqlite-3.3.8/configure.orig 2006-10-03 14:42:27 +0200
-+++ sqlite-3.3.8/configure 2006-12-18 09:51:03 +0100
+Index: sqlite-3.3.13/configure
+--- sqlite-3.3.13/configure.orig 2006-10-03 14:42:27 +0200
++++ sqlite-3.3.13/configure 2006-12-18 09:51:03 +0100
@@ -20472,6 +20472,10 @@
TARGET_HAVE_READLINE=0
fi
@@ -58,9 +70,9 @@
#########
-Index: sqlite-3.3.8/ext/fts1/fts1.c
---- sqlite-3.3.8/ext/fts1/fts1.c.orig 2006-10-08 13:16:32 +0200
-+++ sqlite-3.3.8/ext/fts1/fts1.c 2006-12-18 09:51:03 +0100
+Index: sqlite-3.3.13/ext/fts1/fts1.c
+--- sqlite-3.3.13/ext/fts1/fts1.c.orig 2006-10-08 13:16:32 +0200
++++ sqlite-3.3.13/ext/fts1/fts1.c 2006-12-18 09:51:03 +0100
@@ -19,11 +19,7 @@
#endif
@@ -73,9 +85,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-Index: sqlite-3.3.8/ext/fts1/fts1_porter.c
---- sqlite-3.3.8/ext/fts1/fts1_porter.c.orig 2006-10-01 20:01:13 +0200
-+++ sqlite-3.3.8/ext/fts1/fts1_porter.c 2006-12-18 09:51:03 +0100
+Index: sqlite-3.3.13/ext/fts1/fts1_porter.c
+--- sqlite-3.3.13/ext/fts1/fts1_porter.c.orig 2006-10-01 20:01:13
+0200
++++ sqlite-3.3.13/ext/fts1/fts1_porter.c 2006-12-18 09:51:03 +0100
@@ -26,11 +26,7 @@
@@ -88,9 +100,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-Index: sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c
---- sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c.orig 2006-09-30 15:57:33
+0200
-+++ sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c 2006-12-18 09:51:03 +0100
+Index: sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c
+--- sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c.orig 2006-09-30 15:57:33
+0200
++++ sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c 2006-12-18 09:51:03 +0100
@@ -18,11 +18,7 @@
@@ -103,9 +115,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-Index: sqlite-3.3.8/sqlite3.pc.in
---- sqlite-3.3.8/sqlite3.pc.in.orig 2004-07-19 06:25:47 +0200
-+++ sqlite-3.3.8/sqlite3.pc.in 2006-12-18 09:51:03 +0100
+Index: sqlite-3.3.13/sqlite3.pc.in
+--- sqlite-3.3.13/sqlite3.pc.in.orig 2004-07-19 06:25:47 +0200
++++ sqlite-3.3.13/sqlite3.pc.in 2006-12-18 09:51:03 +0100
@@ -8,5 +8,5 @@
Name: SQLite
Description: SQL database engine
@@ -113,9 +125,9 @@
-Libs: -L${libdir} -lsqlite3
+Libs: -L${libdir} -lsqlite3 @TARGET_LIBS@
Cflags: -I${includedir}
-Index: sqliteodbc-0.70/Makefile.in
---- sqliteodbc-0.70/Makefile.in.orig 2006-07-03 07:51:27 +0200
-+++ sqliteodbc-0.70/Makefile.in 2006-12-18 09:51:12 +0100
+Index: sqliteodbc-0.73/Makefile.in
+--- sqliteodbc-0.73/Makefile.in.orig 2007-02-04 12:23:36 +0100
++++ sqliteodbc-0.73/Makefile.in 2007-02-11 11:43:15 +0100
@@ -6,7 +6,7 @@
CC = @CC@
INSTALL = @INSTALL@
@@ -125,3 +137,18 @@
SQLITE_INC = @SQLITE_INC@
SQLITE_LIB = @SQLITE_LIB@
SQLITE_FLAGS = [EMAIL PROTECTED]@ \
+@@ -74,10 +74,10 @@
+
+ install-3: libsqlite3odbc.la @EXT_BLOBTOXY@ @EXT_IMPEXP@
+ $(LIBTOOL) $(INSTALL) libsqlite3odbc.la $(DESTDIR)$(libdir)
+- test -n "@EXT_BLOBTOXY@" && \
+- $(LIBTOOL) $(INSTALL) @EXT_BLOBTOXY@ $(DESTDIR)$(libdir)
+- test -n "@EXT_IMPEXP@" && \
+- $(LIBTOOL) $(INSTALL) @EXT_IMPEXP@ $(DESTDIR)$(libdir)
++ if [ "[EMAIL PROTECTED]@" != . ]; then \
++ $(LIBTOOL) $(INSTALL) @EXT_BLOBTOXY@ $(DESTDIR)$(libdir); fi
++ if [ "[EMAIL PROTECTED]@" != . ]; then \
++ $(LIBTOOL) $(INSTALL) @EXT_IMPEXP@ $(DESTDIR)$(libdir); fi
+
+ uninstall-3:
+ $(LIBTOOL) --mode=uninstall \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.spec
============================================================================
$ cvs diff -u -r1.113.2.3 -r1.113.2.4 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 22 Dec 2006 19:13:37 -0000
1.113.2.3
+++ openpkg-src/sqlite/sqlite.spec 23 Feb 2007 20:18:11 -0000
1.113.2.4
@@ -1,7 +1,7 @@
##
## sqlite.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
-## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+## Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -23,9 +23,9 @@
##
# package version
-%define V_v3 3.3.8
+%define V_v3 3.3.13
%define V_v2 2.8.17
-%define V_odbc 0.70
+%define V_odbc 0.73
# package information
Name: sqlite
@@ -38,10 +38,10 @@
Group: Database
License: PD
Version: %{V_v3}
-Release: 2.20061222
+Release: 2.20070223
# package options
-%option with_v2 yes
+%option with_v2 no
%option with_utf8 no
%option with_assert no
%option with_readline no
@@ -240,7 +240,7 @@
rm -rf $RPM_BUILD_ROOT
%post
- if [ $1 -eq 1 ]; then
+ if [ $1 -eq 1 ]; then : ;
# optionally link into ODBC
%if "%{with_odbc}" == "yes"
( echo "[SQLite3]"
@@ -267,7 +267,7 @@
fi
%preun
- if [ $1 -eq 0 ]; then
+ if [ $1 -eq 1 ]; then : ;
# optionally unlink from ODBC
%if "%{with_odbc}" == "yes"
$RPM_INSTALL_PREFIX/bin/odbcinst -u -s -l -n "SQLite3 DataSource"
>/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
