Browse Source

sqlite3: update to 3.7.14.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7187 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
778fdadc3c
1 changed files with 26 additions and 16 deletions
  1. 26 16
      s/sqlite3/sqlite3-vl.spec

+ 26 - 16
s/sqlite3/sqlite3-vl.spec

@@ -5,8 +5,9 @@
 
 %define with_check %{?_with_check:1}%{!?_with_check:0}
 
-%define realver 3070500
-%define rpmver %(echo %{realver}|sed -e "s/00//g" -e "s/0/./g")
+%define realver 3071401
+%define docver 3071400
+%define rpmver 3.7.14.1
 
 
 Summary: SQLite is a C library that implements an embeddable SQL database engine
@@ -19,15 +20,23 @@ URL: http://www.sqlite.org
 License: Public Domain
 
 Source0: http://www.sqlite.org/%{archivename}-src-%{realver}.zip
-Source1: http://www.sqlite.org/%{archivename}-doc-%{realver}.zip
-# Fix build with --enable-load-extension, upstream ticket #3137
-Patch1: sqlite-3.6.12-libdl.patch
-# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
-Patch2: sqlite-3.6.23.1-lemon-snprintf.patch
+Source1: http://www.sqlite.org/%{archivename}-doc-%{docver}.zip
+
+# Support a system-wide lemon template
+Patch1: sqlite-3.6.23-lemon-system-template.patch
+# Shut up stupid tests depending on system settings of allowed open fd's
+Patch2: sqlite-3.7.7.1-stupid-openfiles-test.patch
+# Shut up pagecache overflow test whose expected result depends on compile
+# options and whatnot. Dunno why this started failing in 3.7.10 but
+# doesn't seem particularly critical...
+Patch3: sqlite-3.7.10-pagecache-overflow-test.patch
+# sqlite >= 3.7.10 is buggy if malloc_usable_size() is detected, disable it:
+# https://bugzilla.redhat.com/show_bug.cgi?id=801981
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665363
+Patch4: sqlite-3.7.14.1-no-malloc-usable-size.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: readline, ncurses
-BuildRequires: tcl, readline-devel
+BuildRequires: tcl, readline-devel, ncurses-devel
 
 
 %description
@@ -43,7 +52,7 @@ SQLite は組み込み型SQLデータベースエンジンを実装するCライ
 SQLiteライブラリにリンクされたプログラムではSQLデータベースアクセスが
 できるようになります。その際、別のRDBMSプロセスは不要です。
 
-
+ 
 %package -n %{name}-devel
 Summary: Header files and libraries for developing apps which will use sqlite3
 Summary(ja): sqlite3の開発用ヘッダファイル及びライブラリ
@@ -137,8 +146,10 @@ sqlite3-develはSQLiteデータベースライブラリを用いるプログラ
 
 %prep
 %setup -q -a1 -n%{archivename}-src-%{realver}
-%patch1 -p1 -b .libdl
-%patch2 -p1 -b .lemon-sprintf
+%patch1 -p1 -b .lemon-system-template
+%patch2 -p1 -b .stupid-openfiles-test
+%patch3 -p1 -b .pagecache-overflow-test
+%patch4 -p1 -b .no-malloc-usable-size
 
 rm -f %{name}-doc-%{realver}/search
 
@@ -191,8 +202,6 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 %files -n %{name}-devel
 %defattr(-, root, root)
-#%{_libdir}/*.a
-#%{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
@@ -218,14 +227,15 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
-#%{_libdir}/*.a
-#%{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %endif
 
 
 %changelog
+* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.15.1-1
+- new upstream release
+
 * Tue Mar 28 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 3.7.5-1
 - new upstream release