Hello community,
here is the log from the commit of package sqlite3 for openSUSE:Factory
checked in at Fri Dec 4 10:14:18 CET 2009.
--------
--- sqlite3/sqlite3.changes 2009-10-26 17:24:31.000000000 +0100
+++ /mounts/work_src_done/STABLE/sqlite3/sqlite3.changes 2009-11-30 18:28:55.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Nov 30 18:24:34 CET 2009 - max@suse.de
+
+- New version: 3.6.20.
+- Reworked package to use the "amalgamation" source distribution
+ as recommended by the author and to fix the following bugs:
+ * bnc#555845: sqlite3 should link libdl
+ * bnc#470371: system sqlite should be built with fts3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
sqlite-3.6.16.tar.bz2
sqlite.desktop
New:
----
sqlite3.1
sqlite-amalgamation-3.6.20.tar.bz2
sqlite-tcl.patch
sqlite-tcl.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sqlite3.spec ++++++
--- /var/tmp/diff_new_pack.i8hWvu/_old 2009-12-04 10:13:02.000000000 +0100
+++ /var/tmp/diff_new_pack.i8hWvu/_new 2009-12-04 10:13:02.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package sqlite3 (Version 3.6.16)
+# spec file for package sqlite3 (Version 3.6.20)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -30,7 +30,7 @@
%endif
Name: sqlite3
-BuildRequires: gcc-c++ readline-devel tcl-devel
+BuildRequires: readline-devel tcl-devel
%if %{?suse_version:1}%{?!suse_version:0}
BuildRequires: update-desktop-files
%endif
@@ -38,8 +38,8 @@
Group: Productivity/Databases/Servers
Summary: Embeddable SQL Database Engine
Url: http://www.sqlite.org/
-Version: 3.6.16
-Release: 2
+Version: 3.6.20
+Release: 1
# bug437293
%ifarch ppc64
Obsoletes: sqlite-64bit
@@ -50,8 +50,10 @@
%endif
Provides: sqlite = %version
Obsoletes: sqlite < %version
-Source0: http://www.sqlite.org/sqlite-%version.tar.bz2
-Source1: sqlite.desktop
+Source0: http://www.sqlite.org/sqlite-amalgamation-%version.tar.bz2
+Source1: sqlite-tcl.tar.bz2
+Source2: sqlite3.1
+Patch0: sqlite-tcl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -150,44 +152,28 @@
D. Richard Hipp
%prep
-%setup -q -n sqlite-%version
-# does not work due to our ulimits in our build system
-rm test/bigfile.test
+%setup -q -a 1 -q -n sqlite-%version
+%patch0
%build
-autoreconf -f -i
- export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1 -O3 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SERVER=1"
- export CXXFLAGS="$CFLAGS"
- mkdir build
- cd build
- cp ../VERSION .
- ../configure \
- --prefix=/usr \
- --libdir=%_libdir \
- --mandir=%_mandir \
- --enable-threadsafe \
- --enable-load-extension \
- --disable-releasemode \
- --enable-tempstore=yes \
- --sysconfdir=/etc/ \
- --disable-static \
- --with-pic
-make %{?jobs:-j%jobs} \
- TCLLIBDIR=%tcl_archdir/%name
+%configure --disable-static
+make
+cd sqlite-tcl
+autoconf
+%configure --with-tcl=%_libdir
+make
%install
- cd build
- make install \
- DESTDIR="$RPM_BUILD_ROOT" \
- TCLLIBDIR=%tcl_archdir/%name
- echo 'package ifneeded sqlite3 %version [list load $dir/libtclsqlite3.so sqlite3]' \
- > %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
+make install DESTDIR=%buildroot
+rm %buildroot/%_libdir/*.la
+install -d %buildroot%_mandir/man1/
+install -m 0644 %{S:2} %buildroot%_mandir/man1/
+cd sqlite-tcl
+make install DESTDIR=%buildroot libdir=%tcl_archdir
+cd ..
%clean
- rm -rf $RPM_BUILD_ROOT
+ rm -rf %buildroot
#
%if %newscheme
@@ -216,6 +202,7 @@
%files tcl
%defattr(-,root,root)
%tcl_archdir
+%doc %_mandir/mann/*
%files devel
%defattr(-,root,root)
++++++ sqlite-3.6.16.tar.bz2 -> sqlite3.1 ++++++
Files sqlite3/sqlite-3.6.16.tar.bz2 and /mounts/work_src_done/STABLE/sqlite3/sqlite3.1 differ
++++++ sqlite-tcl.patch ++++++
--- sqlite-tcl/configure.in
+++ sqlite-tcl/configure.in
@@ -73,8 +73,8 @@
TEA_ADD_SOURCES([tclsqlite3.c])
TEA_ADD_HEADERS([])
-TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}/generic`\"])
-TEA_ADD_LIBS([])
+TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}/generic`\" -I\"`\${CYGPATH} \${srcdir}/..`\"])
+TEA_ADD_LIBS([-L\"`\${CYGPATH} \${srcdir}/../.libs`\" -lsqlite3])
TEA_ADD_CFLAGS([-DSQLITE_ENABLE_FTS3=1])
TEA_ADD_STUB_SOURCES([])
TEA_ADD_TCL_SOURCES([])
diff '--exclude=configure' -ruBb sqlite-3_6_20-tea/generic/tclsqlite3.c sqlite-3.6.20-amalgamation/tcl/generic/tclsqlite3.c
--- sqlite-tcl/generic/tclsqlite3.c
+++ sqlite-tcl/generic/tclsqlite3.c
@@ -33,10 +33,12 @@
** appended to the amalgamation.
*/
#ifndef SQLITE_AMALGAMATION
-# include "sqliteInt.h"
+# include "sqlite3.h"
# include
# include
# include
+# include
+ typedef uint8_t u8;
#endif
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org