Hello community,
here is the log from the commit of package hk_classes
checked in at Fri Apr 6 16:33:02 CEST 2007.
--------
--- KDE/hk_classes/hk_classes.changes 2007-01-19 12:18:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/hk_classes/hk_classes.changes 2007-04-05 19:18:08.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Apr 5 19:18:00 CEST 2007 - dmueller@suse.de
+
+- build against the system sqlite
+
+-------------------------------------------------------------------
New:
----
external-sqlite.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hk_classes.spec ++++++
--- /var/tmp/diff_new_pack.B23684/_old 2007-04-06 16:30:15.000000000 +0200
+++ /var/tmp/diff_new_pack.B23684/_new 2007-04-06 16:30:15.000000000 +0200
@@ -12,7 +12,7 @@
Name: hk_classes
BuildRequires: doxygen graphviz krb5-devel libjpeg-devel mysql-devel pkgconfig
-BuildRequires: postgresql-devel python-devel qt3-devel sqlite-devel
+BuildRequires: postgresql-devel python-devel qt3-devel sqlite-devel sqlite2-devel
BuildRequires: libxml2-devel unixODBC-devel update-desktop-files
%if %suse_version > 930
BuildRequires: file-devel
@@ -27,10 +27,11 @@
Group: Productivity/Databases/Tools
Summary: Database Interface Library and Classes
Version: 0.8.2
-Release: 34
+Release: 44
Source0: hk_classes-%{version}-test2.tar.bz2
Source1: Doxyfile
Patch1: fix_python_install.patch
+Patch2: external-sqlite.diff
Patch4: fix-return-value.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,9 +75,12 @@
%prep
%setup -q -n %name-%version-test2
%patch1
+%patch2
%patch4
%build
+# make sure we use the system copy
+rm -rf hk_sqlite{,3}classes/sqlite
%{suse_update_config -f . ./hk_classes}
libtoolize --force
aclocal
@@ -85,7 +89,8 @@
autoconf
export HK_CLASSESDIR=%_libdir/hk_classes
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DNDEBUG"
-export LDFLAGS="-L%{_libdir}/mysql"
+export CFLAGS="$RPM_OPT_FLAGS"
+#export LDFLAGS="-L%{_libdir}/mysql"
./configure \
--prefix=$HK_CLASSESDIR \
--mandir=%_mandir \
@@ -139,7 +144,9 @@
%{_mandir}/*/*
%doc /usr/share/doc/KDE3-API
-%changelog -n hk_classes
+%changelog
+* Thu Apr 05 2007 - dmueller@suse.de
+- build against the system sqlite
* Fri Jan 19 2007 - stbinner@suse.de
- fix build requires for < 10.0
* Mon Oct 16 2006 - dmueller@suse.de
++++++ external-sqlite.diff ++++++
--- hk_sqlite3classes/Makefile.am
+++ hk_sqlite3classes/Makefile.am
@@ -35,12 +35,6 @@ extra_src = sqlite/alter.c sqlite/
sqlite/os_unix.c sqlite/pragma.c sqlite/random.c sqlite/table.c sqlite/trigger.c \
sqlite/util.c sqlite/vdbeaux.c sqlite/vdbemem.c sqlite/parse.c sqlite/opcodes.c
-if USESQLITE3LIBRARY
- INCLUDES= -I../hk_classes -I@SQLITE3INCDIR@
+ INCLUDES= -I../hk_classes
libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite3 -L../hk_classes -L@SQLITE3LIBDIR@ -lhk_classes
libhk_sqlite3driver_la_SOURCES= $(normal_src)
-else
- INCLUDES= -I../hk_classes -I ./sqlite
- libhk_sqlite3driver_la_LDFLAGS = -version-info 0:0:0
- libhk_sqlite3driver_la_SOURCES= $(normal_src) $(extra_src)
-endif
--- hk_sqliteclasses/Makefile.am
+++ hk_sqliteclasses/Makefile.am
@@ -36,12 +36,6 @@ extra_src = sqlite/attach.c \
sqlite/hash.c sqlite/table.c sqlite/where.c \
sqlite/insert.c sqlite/tclsqlite.c sqlite/opcodes.c
-if USESQLITE2LIBRARY
- INCLUDES= -I../hk_classes -I@SQLITEINCDIR@
+ INCLUDES= -I../hk_classes
libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0 -lsqlite -L../hk_classes -L@SQLITELIBDIR@ -lhk_classes
libhk_sqlite2driver_la_SOURCES= $(normal_src)
-else
- INCLUDES= -I../hk_classes -I ./sqlite
- libhk_sqlite2driver_la_LDFLAGS = -version-info 0:0:0
- libhk_sqlite2driver_la_SOURCES= $(normal_src) $(extra_src)
-endif
--- hk_sqlite3classes/Makefile.am
+++ hk_sqlite3classes/Makefile.am
@@ -10,10 +10,7 @@ lib_LTLIBRARIES = libhk_sqlite3driver.l
noinst_HEADERS = hk_sqlite3column.h hk_sqlite3connection.h hk_sqlite3database.h\
hk_sqlite3datasource.h hk_sqlite3actionquery.h hk_sqlite3resultquery.h\
- hk_sqlite3table.h hk_sqlite3view.h \
- sqlite/sqlite3.h sqlite/parse.h sqlite/opcodes.h sqlite/keywordhash.h \
- sqlite/btree.h sqlite/hash.h sqlite/os_common.h sqlite/os.h sqlite/pager.h \
- sqlite/sqliteInt.h sqlite/vdbe.h sqlite/vdbeInt.h
+ hk_sqlite3table.h hk_sqlite3view.h
--- hk_sqliteclasses/Makefile.am
+++ hk_sqliteclasses/Makefile.am
@@ -10,11 +10,7 @@ lib_LTLIBRARIES = libhk_sqlite2driver.l
noinst_HEADERS = hk_sqlitecolumn.h hk_sqliteconnection.h hk_sqlitedatabase.h\
hk_sqlitedatasource.h hk_sqliteactionquery.h hk_sqliteresultquery.h\
- hk_sqlitetable.h hk_sqliteview.h \
- sqlite/btree.h sqlite/os.h sqlite/sqliteInt.h \
- sqlite/config.h sqlite/pager.h sqlite/vdbe.h \
- sqlite/hash.h sqlite/parse.h sqlite/vdbeInt.h \
- sqlite/opcodes.h sqlite/sqlite.h
+ hk_sqlitetable.h hk_sqliteview.h
--- hk_sqliteclasses/hk_sqlitedatabase.h
+++ hk_sqliteclasses/hk_sqlitedatabase.h
@@ -12,7 +12,7 @@
#define HK_SQLITEDATABASE
#include "hk_database.h"
#include "hk_sqlitedatasource.h"
-#include "sqlite/sqlite.h"
+#include