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: 17-Jul-2007 12:50:51
Branch: HEAD Handle: 2007071711505100
Added files:
openpkg-src/sqlite sqlite.patch.odbc
Modified files:
openpkg-src/sqlite sqlite.patch sqlite.spec
Log:
split ODBC patch out from sqlite.patch (I require this for rpm5.org)
Summary:
Revision Changes Path
1.34 +0 -27 openpkg-src/sqlite/sqlite.patch
1.1 +27 -0 openpkg-src/sqlite/sqlite.patch.odbc
1.144 +6 -2 openpkg-src/sqlite/sqlite.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch
============================================================================
$ cvs diff -u -r1.33 -r1.34 sqlite.patch
--- openpkg-src/sqlite/sqlite.patch 20 Jun 2007 16:12:31 -0000 1.33
+++ openpkg-src/sqlite/sqlite.patch 17 Jul 2007 10:50:51 -0000 1.34
@@ -151,33 +151,6 @@
-Libs: -L${libdir} -lsqlite3
+Libs: -L${libdir} -lsqlite3 @LIBS@
Cflags: -I${includedir}
-Index: sqliteodbc-0.74/Makefile.in
---- sqliteodbc-0.74/Makefile.in.orig 2007-02-04 12:23:36 +0100
-+++ sqliteodbc-0.74/Makefile.in 2007-06-20 18:09:00 +0200
-@@ -6,7 +6,7 @@
- CC = @CC@
- INSTALL = @INSTALL@
- LIBTOOL = ./libtool
--CFLAGS= @CFLAGS@ -DDRIVER_VER_INFO=\"@[EMAIL PROTECTED]"
-+CFLAGS= @CFLAGS@ @CPPFLAGS@ -DDRIVER_VER_INFO=\"@[EMAIL
PROTECTED]"
- 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 \
Index: src/shell.c
--- src/shell.c.orig 2007-06-12 14:18:01 +0200
+++ src/shell.c 2007-06-20 18:09:00 +0200
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sqlite/sqlite.patch.odbc
============================================================================
$ cvs diff -u -r0 -r1.1 sqlite.patch.odbc
--- /dev/null 2007-07-17 12:50:18 +0200
+++ sqlite.patch.odbc 2007-07-17 12:50:51 +0200
@@ -0,0 +1,27 @@
+Index: Makefile.in
+--- Makefile.in.orig 2007-02-04 12:23:36 +0100
++++ Makefile.in 2007-06-20 18:09:00 +0200
+@@ -6,7 +6,7 @@
+ CC = @CC@
+ INSTALL = @INSTALL@
+ LIBTOOL = ./libtool
+-CFLAGS= @CFLAGS@ -DDRIVER_VER_INFO=\"@[EMAIL PROTECTED]"
++CFLAGS= @CFLAGS@ @CPPFLAGS@ -DDRIVER_VER_INFO=\"@[EMAIL
PROTECTED]"
+ 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.143 -r1.144 sqlite.spec
--- openpkg-src/sqlite/sqlite.spec 23 Jun 2007 18:40:40 -0000 1.143
+++ openpkg-src/sqlite/sqlite.spec 17 Jul 2007 10:50:51 -0000 1.144
@@ -37,7 +37,7 @@
Group: Database
License: PD
Version: %{V_sqlite}
-Release: 20070623
+Release: 20070717
# package options
%option with_utf8 no
@@ -52,6 +52,7 @@
Source0: http://www.sqlite.org/sqlite-%{V_sqlite}.tar.gz
Source1: http://www.ch-werner.de/sqliteodbc/sqliteodbc-%{V_odbc}.tar.gz
Patch0: sqlite.patch
+Patch1: sqlite.patch.odbc
# build information
Prefix: %{l_prefix}
@@ -94,8 +95,11 @@
%prep
%setup -q
+ %patch -p0 -P 0
+%if "%{with_odbc}" == "yes"
%setup -q -D -T -a 1
- %patch -p0
+ %patch -p0 -d sqliteodbc-%{V_odbc} -P 1
+%endif
# post-adjust sources
%{l_shtool} subst \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
