SPECS (twittner): hk_classes.spec - link with system libraries: fi...

[twittner]

Author: twittner                     Date: Sun Apr 23 18:17:12 2006 GMT
Module: SPECS                         Tag: twittner
---- Log message:
- link with system libraries: fixes for mdb. paradox and sqlite3 hk_classes
- hk_classes.patch incorporates fixes from -{dir,iconv-in-libc}.patch

---- Files affected:
SPECS:
   hk_classes.spec (1.47.2.8.2.6 -> 1.47.2.8.2.7) 

---- Diffs:

================================================================
Index: SPECS/hk_classes.spec
diff -u SPECS/hk_classes.spec:1.47.2.8.2.6 SPECS/hk_classes.spec:1.47.2.8.2.7
--- SPECS/hk_classes.spec:1.47.2.8.2.6	Sat Apr 22 21:44:53 2006
+++ SPECS/hk_classes.spec	Sun Apr 23 20:17:07 2006
@@ -1,12 +1,10 @@
 # $Revision$, $Date$
 # TODO:	- make python build *.pyo also and include it instead of *.py
 #	- patch3 should be rewritten to search for .pyc and .py not only .pyc and sent back
-#	- link against mdbtools library instead of using use boundled mdbtools sources
-#	- link against paradox library instead of ...
 #
 # Conditional build:
 %bcond_without	firebird
-%bcond_without	mdb
+%bcond_with	mdb
 %bcond_without	mysql
 %bcond_without	odbc	
 %bcond_without	pgsql
@@ -25,8 +23,7 @@
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/hk-classes/%{name}-%{version}.tar.gz
 # Source0-md5:	17234b38b36dca09b4fb2d8a4752fc0a
-Patch0:		%{name}-dir.patch
-Patch1:		%{name}-iconv-in-libc.patch
+Patch0:		%{name}.patch
 URL:		http://hk-classes.sourceforge.net/
 BuildRequires:	autoconf >= 2.56
 BuildRequires:	automake >= 1:1.7.6
@@ -38,11 +35,11 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	python-devel
 %{?with_firebird:BuildRequires:	Firebird-devel}
-#%%{?with_mdb:BuildRequires:	mdbtools-devel >= 0.6}
+%{?with_mdb:BuildRequires:	mdbtools-devel >= 0.6}
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_pgsql:BuildRequires:	postgresql-backend-devel >= 7.1}
 %{?with_pgsql:BuildRequires:	postgresql-devel >= 7.1}
-#%%{?with_paradox:BuildRequires:	pxlib-devel}
+%{?with_paradox:BuildRequires:	pxlib-devel}
 %{?with_sqlite2:BuildRequires:	sqlite-devel}
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
@@ -229,7 +226,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 # supplied libtool is broken (C++)
@@ -244,13 +240,13 @@
 	--with-hk_classes-incdir=%{_includedir}/%{name} \
 	--with-hk_classes-drvdir=%{_libdir}/%{name}/drivers \
 	--with%{!?with_firebird:out}-firebird \
-	--with%{!?with_mdb:out}-mdb \
+	--with-mdb=%{?with_mdb:external}%{!?with_mdb:no} \
 	--with%{!?with_mysql:out}-mysql \
 	--with%{!?with_odbc:out}-odbc \
-	--with%{!?with_paradox:out}-paradox \
+	--with-paradox=%{?with_paradox:external}%{!?with_paradox:no} \
 	--with%{!?with_pgsql:out}-postgres \
 	--with%{!?with_sqlite2:out}-sqlite \
-	--with%{!?with_sqlite3:out}-sqlite3 \
+	--with-sqlite3=%{?with_sqlite3:external}%{!?with_sqlite3:no} \
 	--with%{!?with_xbase:out}-xbase \
 	%{?with_static_libs:--enable-static=yes}
 %{__make}
@@ -368,6 +364,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47.2.8.2.7  2006/04/23 18:17:07  twittner
+- link with system libraries: fixes for mdb. paradox and sqlite3 hk_classes
+- hk_classes.patch incorporates fixes from -{dir,iconv-in-libc}.patch
+
 Revision 1.47.2.8.2.6  2006/04/22 19:44:53  twittner
 - up to 0.8.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hk_classes.spec?r1=1.47.2.8.2.6&r2=1.47.2.8.2.7&f=u