2011-04-06 Ginn Chen <
[email protected]>
* base-specs/sqlite.spec:
* patches/sqlite3-02-using-libcurses.diff:
Update sqlite3-02-using-libcurses.diff to fix CR #7031954.
--- a/ChangeLog Wed Apr 06 02:38:01 2011 +0000
+++ b/ChangeLog Wed Apr 06 02:50:08 2011 +0000
@@ -1,3 +1,9 @@
+2011-04-06 Ginn Chen <[email protected]>
+
+ * base-specs/sqlite.spec:
+ * patches/sqlite3-02-using-libcurses.diff:
+ Update sqlite3-02-using-libcurses.diff to fix CR #7031954.
+
2011-04-06 Ginn Chen <[email protected]>
* patches/libffi-03-sparcv8-struct-return.diff: Update the patch.
--- a/base-specs/sqlite.spec Wed Apr 06 02:38:01 2011 +0000
+++ b/base-specs/sqlite.spec Wed Apr 06 02:50:08 2011 +0000
@@ -3,7 +3,7 @@
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-%define owner hawklu
+%define owner ginnchen
# bugdb: bugzilla.freedesktop.org
#
@@ -26,10 +26,10 @@
# This is specified here since unzip is used in this spec file.
BuildRequires: compress/unzip
-# owner:hawklu date:2008-10-10 type:bug bugster:6750518
+# owner:hawklu date:2008-10-10 type:bug bugster:??
Patch1: sqlite3-01-using-mapfile.diff
-# owner:hawklu date:2010-04-01 type:bug d.o.o 15412
+# owner:ginnchen date:2011-03-29 type:bug d.o.o 15412 bugster:7031954
Patch2: sqlite3-02-using-libcurses.diff
URL: http://www.sqlite.org
@@ -55,8 +55,8 @@
%prep
%setup -q -n %{name}-autoconf-%{tarball_version}
-
%patch1 -p1
+%patch2 -p1
%build
%ifos linux
@@ -121,8 +121,10 @@
%{_libdir}/pkgconfig/*
%changelog
-* Fri Mar 18 2010 - [email protected]
-- Fix bug CR7026620
+* Tue Mar 29 2011 - [email protected]
+- Update sqlite3-02-using-libcurses.diff to fix CR #7031954.
+* Fri Mar 18 2011 - [email protected]
+- Fix bug CR #7026620
* Thu Oct 21 2010 - [email protected]
- Bump to 3.7.3
* Tue Jun 08 2010 - [email protected]
--- a/patches/sqlite3-02-using-libcurses.diff Wed Apr 06 02:38:01 2011 +0000
+++ b/patches/sqlite3-02-using-libcurses.diff Wed Apr 06 02:50:08 2011 +0000
@@ -1,11 +1,10 @@
---- sqlite-3.6.22/Makefile.in.old 2010-04-01 10:13:05.598353118 +0800
-+++ sqlite-3.6.22/Makefile.in 2010-04-01 10:39:40.808794452 +0800
-@@ -475,7 +475,7 @@
- sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
- $(LTLINK) $(READLINE_FLAGS) \
- -o $@ $(TOP)/src/shell.c libsqlite3.la \
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
-+ -z record $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
+--- a/Makefile.am.orig 2011-03-29 15:44:46.468935251 +0800
++++ b/Makefile.am 2011-03-29 15:50:12.071188848 +0800
+@@ -8,6 +8,7 @@
+ bin_PROGRAMS = sqlite3
+ sqlite3_SOURCES = shell.c sqlite3.h
+ sqlite3_LDADD = $(top_builddir)/libsqlite3.la @READLINE_LIBS@
++sqlite3_LDFLAGS = -Wl,-zrecord
+ sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la
- # This target creates a directory named "tsrc" and fills it with
- # copies of all of the C source code and header files needed to
+ include_HEADERS = sqlite3.h sqlite3ext.h