From 3f03fb3f920dabf7bd1cb5864e8876911b2975cb4b76849abe20e79a187d1042 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 5 Jun 2009 20:44:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sqlite3?expand=0&rev=16 --- sqlite-3.6.14.2.tar.bz2 | 3 +++ sqlite-3.6.4.tar.bz2 | 3 --- sqlite3.changes | 8 ++++++ sqlite3.spec | 56 +++++++++++++++++++++++++++++++++-------- 4 files changed, 56 insertions(+), 14 deletions(-) create mode 100644 sqlite-3.6.14.2.tar.bz2 delete mode 100644 sqlite-3.6.4.tar.bz2 diff --git a/sqlite-3.6.14.2.tar.bz2 b/sqlite-3.6.14.2.tar.bz2 new file mode 100644 index 0000000..e0a4ea3 --- /dev/null +++ b/sqlite-3.6.14.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8026c203588785f95a2034bd154ff3ac6a071bfd32ff65426b3302947e15392f +size 2213970 diff --git a/sqlite-3.6.4.tar.bz2 b/sqlite-3.6.4.tar.bz2 deleted file mode 100644 index a49685b..0000000 --- a/sqlite-3.6.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05c7992478235c0b54f0ca283391a9daa8176f2b388e2241e5eae07aaab1a978 -size 1742020 diff --git a/sqlite3.changes b/sqlite3.changes index ce12518..34ee448 100644 --- a/sqlite3.changes +++ b/sqlite3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 2 17:45:52 CEST 2009 - max@suse.de + +- New version 3.6.14.2: + * Fix a code generator bug introduced in version 3.6.14. This bug + can cause incorrect query results under obscure circumstances. +- Use the old naming scheme when building on openSUSE < 11.0. + ------------------------------------------------------------------- Sun Feb 22 22:02:19 CET 2009 - crrodriguez@suse.de diff --git a/sqlite3.spec b/sqlite3.spec index b2035ac..78c4376 100644 --- a/sqlite3.spec +++ b/sqlite3.spec @@ -1,5 +1,5 @@ # -# spec file for package sqlite3 (Version 3.6.4) +# spec file for package sqlite3 (Version 3.6.14.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,6 +17,17 @@ # norootforbuild +%if 0%{?!tcl_archdir:1} +# %tcl_archdir didn't exist before openSUSE 11.0 +%define tcl_archdir %(echo 'puts [lindex $tcl_pkgPath 0]'|tclsh) +%endif +# +%if 0%{?suse_version} >= 1100 +# The package naming scheme changed starting with openSUSE 11.0 +%define newscheme 1 +%else +%define newscheme 0 +%endif Name: sqlite3 BuildRequires: gcc-c++ readline-devel tcl-devel @@ -27,14 +38,16 @@ License: Public Domain, Freeware Group: Productivity/Databases/Servers Summary: Embeddable SQL Database Engine Url: http://www.sqlite.org/ -Version: 3.6.4 -Release: 4 -Requires: libsqlite3-0 = %version +Version: 3.6.14.2 +Release: 1 # bug437293 %ifarch ppc64 Obsoletes: sqlite-64bit %endif # +%if %newscheme +Requires: libsqlite3-0 = %version +%endif Provides: sqlite = %version Obsoletes: sqlite < %version Source0: http://www.sqlite.org/sqlite-%version.tar.bz2 @@ -59,6 +72,8 @@ Authors: -------- D. Richard Hipp +%if %newscheme + %package -n libsqlite3-0 License: Public Domain, Freeware Summary: Shared libraries for the Embeddable SQL Database Engine @@ -85,6 +100,8 @@ Authors: -------- D. Richard Hipp +%endif + %package tcl License: Public Domain, Freeware Group: Development/Libraries/Tcl @@ -152,35 +169,47 @@ autoreconf -f -i --disable-releasemode \ --enable-tempstore=yes \ --sysconfdir=/etc/ \ - --disable-static \ - --with-pic -%{__make} %{?jobs:-j%jobs} + --disable-static \ + --with-pic +make %{?jobs:-j%jobs} \ + TCLLIBDIR=%tcl_archdir/%name %install cd build make install \ DESTDIR="$RPM_BUILD_ROOT" \ - TCLLIBDIR=%tcl_archdir + TCLLIBDIR=%tcl_archdir/%name echo 'package ifneeded sqlite3 %version [list load $dir/libtclsqlite3.so sqlite3]' \ - > %buildroot%tcl_archdir/sqlite3/pkgIndex.tcl + > %buildroot%tcl_archdir/%name/pkgIndex.tcl install -d $RPM_BUILD_ROOT%_mandir/man1/ install -m 0644 ../sqlite3.1 $RPM_BUILD_ROOT%_mandir/man1/ -%{__rm} -f %{buildroot}%{_libdir}/*.la + rm -f %buildroot%_libdir/*.la %clean rm -rf $RPM_BUILD_ROOT +# +%if %newscheme %post -n libsqlite3-0 -p /sbin/ldconfig %postun -n libsqlite3-0 -p /sbin/ldconfig +%else + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig +%endif %files %defattr(-,root,root) /usr/bin/sqlite3 -%_mandir/man1/* +%doc %_mandir/man1/* +# +%if %newscheme %files -n libsqlite3-0 %defattr(-,root,root) +%endif %_libdir/libsqlite*.so.* %files tcl @@ -194,6 +223,11 @@ autoreconf -f -i %_libdir/pkgconfig/sqlite3.pc %changelog +* Tue Jun 02 2009 max@suse.de +- New version 3.6.14.2: + * Fix a code generator bug introduced in version 3.6.14. This bug + can cause incorrect query results under obscure circumstances. +- Use the old naming scheme when building on openSUSE < 11.0. * Sun Feb 22 2009 crrodriguez@suse.de - remove static libraries and "la" files * Tue Jan 13 2009 olh@suse.de