Update to 3.4.1

This commit is contained in:
Paul Nasrat 2007-07-21 11:30:36 +00:00
parent b9100e27a9
commit 40ea45c47e
4 changed files with 7 additions and 104 deletions

View File

@ -1,12 +1 @@
sqlite-3.2.2.tar.gz sqlite-3.4.1.tar.gz
sqlite-3.2.5.tar.gz
sqlite-3.2.6.tar.gz
sqlite-3.2.7.tar.gz
sqlite-3.2.8.tar.gz
sqlite-3.3.2.tar.gz
sqlite-3.3.3.tar.gz
sqlite-3.3.5.tar.gz
sqlite-3.3.6.tar.gz
sqlite-3.3.13.tar.gz
sqlite-3.3.17.tar.gz
sqlite-3.4.0.tar.gz

View File

@ -1 +1 @@
cee12d4b4237e48a91467e5b0fa7e5a8 sqlite-3.4.0.tar.gz 0f06955b18da295fecb62d4bf9ded3c6 sqlite-3.4.1.tar.gz

View File

@ -1,87 +0,0 @@
Build FTS based on http://marc.info/?l=sqlite-users&m=118004021520533&q=raw
--- sqlite-3.3.17/Makefile.in.fts 2007-06-01 12:52:44.000000000 +0100
+++ sqlite-3.3.17/Makefile.in 2007-06-01 12:54:19.000000000 +0100
@@ -116,7 +116,9 @@
# You should not have to change anything below this line
###############################################################################
-TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
+#TCC += -DSQLITE_OMIT_LOAD_EXTENSION=1
+TCC += -DSQLITE_ENABLE_FTS1=1
+TCC += -DSQLITE_ENABLE_FTS2=1
# Object files for the SQLite library.
#
@@ -130,6 +132,12 @@
vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
where.lo utf.lo legacy.lo vtab.lo
+# FTS1 (optional)
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+
+# FTS2 (optional)
+LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
+
# All of the source code files.
#
SRC = \
@@ -194,7 +202,14 @@
$(TOP)/ext/fts1/fts1_hash.h \
$(TOP)/ext/fts1/fts1_porter.c \
$(TOP)/ext/fts1/fts1_tokenizer.h \
- $(TOP)/ext/fts1/fts1_tokenizer1.c
+ $(TOP)/ext/fts1/fts1_tokenizer1.c \
+ $(TOP)/ext/fts2/fts2.c \
+ $(TOP)/ext/fts2/fts2.h \
+ $(TOP)/ext/fts2/fts2_hash.c \
+ $(TOP)/ext/fts2/fts2_hash.h \
+ $(TOP)/ext/fts2/fts2_porter.c \
+ $(TOP)/ext/fts2/fts2_tokenizer.h \
+ $(TOP)/ext/fts2/fts2_tokenizer1.c
# Source code to the test files.
@@ -252,7 +267,10 @@
HDR += \
$(TOP)/ext/fts1/fts1.h \
$(TOP)/ext/fts1/fts1_hash.h \
- $(TOP)/ext/fts1/fts1_tokenizer.h
+ $(TOP)/ext/fts1/fts1_tokenizer.h \
+ $(TOP)/ext/fts2/fts2.h \
+ $(TOP)/ext/fts2/fts2_hash.h \
+ $(TOP)/ext/fts2/fts2_tokenizer.h
# Header files used by the VDBE submodule
#
@@ -469,6 +487,30 @@
where.lo: $(TOP)/src/where.c $(HDR)
$(LTCOMPILE) -c $(TOP)/src/where.c
+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)
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
+
+fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
+
+fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+fts2.lo: $(TOP)/ext/fts2/fts2.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
+
+fts2_hash.lo: $(TOP)/ext/fts2/fts2_hash.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
+
+fts2_porter.lo: $(TOP)/ext/fts2/fts2_porter.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
+
+fts2_tokenizer1.lo: $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
+ $(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
+
tclsqlite-shell.lo: $(TOP)/src/tclsqlite.c $(HDR)
$(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c

View File

@ -5,13 +5,12 @@
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
Name: sqlite Name: sqlite
Version: 3.4.0 Version: 3.4.1
Release: 2%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
Group: Applications/Databases Group: Applications/Databases
URL: http://www.sqlite.org/ URL: http://www.sqlite.org/
Source: http://www.sqlite.org/sqlite-%{version}.tar.gz Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
Patch0: sqlite-3.3.17-fts.patch
Obsoletes: sqlite3 sqlite3-devel Obsoletes: sqlite3 sqlite3-devel
BuildRequires: ncurses-devel readline-devel glibc-devel BuildRequires: ncurses-devel readline-devel glibc-devel
BuildRequires: /usr/bin/tclsh BuildRequires: /usr/bin/tclsh
@ -51,7 +50,6 @@ This package contains the tcl modules for %{name}.
%prep %prep
%setup -q %setup -q
#patch0 -p1 -b .fts
%build %build
export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall" export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@ -108,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Sat Jul 21 2007 Paul Nasrat <pnasrat@redhat.com> - 3.4.1-1
- Update to 3.4.1
* Sun Jun 24 2007 Paul Nasrat <pnsarat@redhat.com> - 3.4.0-2 * Sun Jun 24 2007 Paul Nasrat <pnsarat@redhat.com> - 3.4.0-2
- Disable load for now (#245486) - Disable load for now (#245486)