浏览代码

upgrading package: sqlite 3.5.6 -> 3.5.7

Ralf S. Engelschall 17 年之前
父节点
当前提交
74c9528354
共有 2 个文件被更改,包括 15 次插入17 次删除
  1. 12 14
      sqlite/sqlite.patch
  2. 3 3
      sqlite/sqlite.spec

+ 12 - 14
sqlite/sqlite.patch

@@ -1,9 +1,9 @@
 Index: Makefile.in
---- Makefile.in.orig	2008-01-22 19:42:50 +0100
-+++ Makefile.in	2008-02-07 19:18:34 +0100
-@@ -133,6 +133,24 @@
-          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
-          where.lo utf.lo legacy.lo vtab.lo
+--- Makefile.in.orig	2008-03-14 19:01:53 +0100
++++ Makefile.in	2008-03-18 21:49:33 +0100
+@@ -149,6 +149,24 @@
+ LIBOBJ = $(OBJS$(USE_AMALGAMATION))
+ 
  
 +# FTS1 support
 +ifdef FTS1
@@ -26,10 +26,11 @@ Index: Makefile.in
  # All of the source code files.
  #
  SRC = \
-@@ -554,6 +572,33 @@
- 	$(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
- 		 libsqlite3.la $(LIBTCL)
- 
+@@ -712,3 +730,31 @@
+ sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
+ 	$(TCC) -shared -o $@ sqlite3.def \
+ 		-Wl,"--strip-all" $(REAL_LIBOBJ)
++
 +fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
 +fts1_hash.lo:	$(TOP)/ext/fts1/fts1_hash.c $(HDR)
@@ -57,12 +58,9 @@ Index: Makefile.in
 +fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
 +	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
 +
- testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
- 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
-                 -DSQLITE_NO_SYNC=1 $(TEMP_STORE) \
 Index: sqlite3.pc.in
---- sqlite3.pc.in.orig	2007-11-30 02:28:10 +0100
-+++ sqlite3.pc.in	2008-02-07 19:18:34 +0100
+--- sqlite3.pc.in.orig	2008-03-14 19:01:53 +0100
++++ sqlite3.pc.in	2008-03-18 21:45:30 +0100
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine

+ 3 - 3
sqlite/sqlite.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_sqlite   3.5.6
+%define       V_sqlite   3.5.7
 %define       V_odbc     0.77
 %define       V_jdbc     20080315
 
@@ -37,7 +37,7 @@ Class:        BASE
 Group:        Database
 License:      PD
 Version:      %{V_sqlite}
-Release:      20080316
+Release:      20080318
 
 #   package options
 %option       with_assert          no
@@ -127,7 +127,7 @@ AutoReqProv:  no
 %if "%{with_assert}" == "no"
     CFLAGS="$CFLAGS -DNDEBUG=1"
 %endif
-    CPPFLAGS="%{l_cppflags}"
+    CPPFLAGS="-I. %{l_cppflags}"
     LDFLAGS="%{l_ldflags}"
     LIBS="-lm"
     export CC