Browse Source

adjust patch

Ralf S. Engelschall 14 years ago
parent
commit
47646c7fc0
2 changed files with 23 additions and 24 deletions
  1. 22 23
      sqlite/sqlite.patch
  2. 1 1
      sqlite/sqlite.spec

+ 22 - 23
sqlite/sqlite.patch

@@ -1,7 +1,7 @@
 Index: Makefile.in
---- Makefile.in.orig	2010-07-18 21:30:41.000000000 +0200
-+++ Makefile.in	2010-07-22 21:25:22.000000000 +0200
-@@ -191,6 +191,21 @@
+--- Makefile.in.orig	2011-09-19 20:46:52.000000000 +0200
++++ Makefile.in	2011-09-24 10:21:36.000000000 +0200
+@@ -188,6 +188,21 @@
  #
  LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
  
@@ -23,7 +23,7 @@ Index: Makefile.in
  
  # All of the source code files.
  #
-@@ -325,6 +340,8 @@
+@@ -324,6 +339,8 @@
  SRC += \
    $(TOP)/ext/rtree/rtree.h \
    $(TOP)/ext/rtree/rtree.c
@@ -32,7 +32,7 @@ Index: Makefile.in
  
  
  # Generated source code files
-@@ -835,6 +852,8 @@
+@@ -856,6 +873,8 @@
  rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
  	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
  
@@ -42,24 +42,23 @@ Index: Makefile.in
  # Rules to build the 'testfixture' application.
  #
 Index: configure
---- configure.orig	2010-07-18 21:30:41.000000000 +0200
-+++ configure	2010-07-22 21:24:57.000000000 +0200
-@@ -6012,11 +6012,7 @@
- if $ac_preproc_ok; then
-   :
+--- configure.orig	2011-09-19 20:46:52.000000000 +0200
++++ configure	2011-09-24 10:21:59.000000000 +0200
+@@ -5972,10 +5972,7 @@
+ if $ac_preproc_ok; then :
+ 
  else
--  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++    :
  fi
  
  ac_ext=c
 Index: ext/regexp/regexp.c
---- ext/regexp/regexp.c.orig	2010-07-22 21:24:57.000000000 +0200
-+++ ext/regexp/regexp.c	2010-07-22 21:24:57.000000000 +0200
+--- ext/regexp/regexp.c.orig	2011-09-24 10:21:36.000000000 +0200
++++ ext/regexp/regexp.c	2011-09-24 10:21:36.000000000 +0200
 @@ -0,0 +1,147 @@
 +/*
 + * SQLite REGEXP(regex, string) function
@@ -209,8 +208,8 @@ Index: ext/regexp/regexp.c
 +#endif
 +
 Index: sqlite3.pc.in
---- sqlite3.pc.in.orig	2010-06-21 13:48:22.000000000 +0200
-+++ sqlite3.pc.in	2010-07-22 21:24:57.000000000 +0200
+--- sqlite3.pc.in.orig	2011-09-19 20:46:52.000000000 +0200
++++ sqlite3.pc.in	2011-09-24 10:21:36.000000000 +0200
 @@ -8,6 +8,5 @@
  Name: SQLite
  Description: SQL database engine
@@ -220,9 +219,9 @@ Index: sqlite3.pc.in
 +Libs: -L${libdir} -lsqlite3 @LIBS@
  Cflags: -I${includedir}
 Index: src/main.c
---- src/main.c.orig	2010-07-18 21:30:41.000000000 +0200
-+++ src/main.c	2010-07-22 21:24:57.000000000 +0200
-@@ -1869,6 +1869,13 @@
+--- src/main.c.orig	2011-09-19 20:46:52.000000000 +0200
++++ src/main.c	2011-09-24 10:21:36.000000000 +0200
+@@ -2257,6 +2257,13 @@
    }
  #endif
  

+ 1 - 1
sqlite/sqlite.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Database
 License:      PD
 Version:      %{V_sqlite}
-Release:      20110922
+Release:      20110924
 
 #   package options
 %option       with_debug           no