rpms/sqlite
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- upstream fix yum breakage caused by new keywords (#481189)

Browse Source
This commit is contained in:
Panu Matilainen 2009-01-22 19:47:34 +00:00
parent bc56a18c61
commit e201d7b098
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sqlite-3.6.10-keywords.patch Normal file
View File

@ -0,0 +1,32 @@
diff -up sqlite-3.6.10/src/parse.y.keywords sqlite-3.6.10/src/parse.y
--- sqlite-3.6.10/src/parse.y.keywords 2009-01-15 16:01:46.000000000 +0200
+++ sqlite-3.6.10/src/parse.y 2009-01-22 21:38:42.000000000 +0200
@@ -183,8 +183,8 @@ id(A) ::= ID(X). {A = X;}
ABORT AFTER ANALYZE ASC ATTACH BEFORE BEGIN CASCADE CAST CONFLICT
DATABASE DEFERRED DESC DETACH EACH END EXCLUSIVE EXPLAIN FAIL FOR
IGNORE IMMEDIATE INITIALLY INSTEAD LIKE_KW MATCH PLAN
- QUERY KEY OF OFFSET PRAGMA RAISE REPLACE RESTRICT ROW
- TEMP TRIGGER VACUUM VIEW VIRTUAL
+ QUERY KEY OF OFFSET PRAGMA RAISE RELEASE REPLACE RESTRICT ROW
+ SAVEPOINT TEMP TRIGGER VACUUM VIEW VIRTUAL
%ifdef SQLITE_OMIT_COMPOUND_SELECT
EXCEPT INTERSECT UNION
%endif SQLITE_OMIT_COMPOUND_SELECT
diff -up sqlite-3.6.10/test/table.test.keywords sqlite-3.6.10/test/table.test
--- sqlite-3.6.10/test/table.test.keywords 2008-11-06 00:38:57.000000000 +0200
+++ sqlite-3.6.10/test/table.test 2009-01-22 21:38:42.000000000 +0200
@@ -314,6 +314,14 @@ do_test table-7.3 {
SELECT * FROM weird;
}
} {desc a asc b key 9 14_vac 0 fuzzy_dog_12 xyz begin hi end y'all}
+do_test table-7.3 {
+ execsql {
+ CREATE TABLE savepoint(release);
+ INSERT INTO savepoint(release) VALUES(10);
+ UPDATE savepoint SET release = 5;
+ SELECT release FROM savepoint;
+ }
+} {5}
# Try out the CREATE TABLE AS syntax
#

8
sqlite.spec
View File

@ -6,7 +6,7 @@
Summary: Library that implements an embeddable SQL database engine Summary: Library that implements an embeddable SQL database engine
Name: sqlite Name: sqlite
Version: 3.6.10 Version: 3.6.10
Release: 1%{?dist} Release: 2%{?dist}
License: Public Domain License: Public Domain
Group: Applications/Databases Group: Applications/Databases
URL: http://www.sqlite.org/ URL: http://www.sqlite.org/
@ -15,6 +15,8 @@ Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
Patch1: sqlite-3.6.6.2-libdl.patch Patch1: sqlite-3.6.6.2-libdl.patch
# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian # Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
Patch2: sqlite-3.6.6.2-lemon-snprintf.patch Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
# Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=6186
Patch3: sqlite-3.6.10-keywords.patch
Obsoletes: sqlite3 sqlite3-devel Obsoletes: sqlite3 sqlite3-devel
BuildRequires: ncurses-devel readline-devel glibc-devel BuildRequires: ncurses-devel readline-devel glibc-devel
%if %{with tcl} %if %{with tcl}
@ -75,6 +77,7 @@ This package contains the tcl modules for %{name}.
%setup -q %setup -q
%patch1 -p1 -b .libdl %patch1 -p1 -b .libdl
%patch2 -p1 -b .lemon-sprintf %patch2 -p1 -b .lemon-sprintf
%patch3 -p1 -b .keywords
%build %build
export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall" export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@ -145,6 +148,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Jan 22 2009 Panu Matilainen <pmatilai@redhat.com> - 3.6.10-2
- upstream fix yum breakage caused by new keywords (#481189)
* Thu Jan 22 2009 Panu Matilainen <pmatilai@redhat.com> - 3.6.10-1 * Thu Jan 22 2009 Panu Matilainen <pmatilai@redhat.com> - 3.6.10-1
- update to 3.6.10 - update to 3.6.10