SPECS: libgda.spec - updated freetds064 patch - readded xbase patc...

[qboosh]

Author: qboosh                       Date: Thu May 31 22:20:40 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated freetds064 patch
- readded xbase patch (now in version backported from libgda 3.0.1)
- added mdb2 patch (one more mdb fix)
- renamed bcond: without mdb06 -> with mdb05

---- Files affected:
SPECS:
   libgda.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: SPECS/libgda.spec
diff -u SPECS/libgda.spec:1.112 SPECS/libgda.spec:1.113
--- SPECS/libgda.spec:1.112	Sun May 13 20:14:49 2007
+++ SPECS/libgda.spec	Fri Jun  1 00:20:35 2007
@@ -5,13 +5,13 @@
 %bcond_without	freetds		# build without freetds plugin
 %bcond_without	ldap		# build without ldap plugin
 %bcond_without	mdb		# build without MDB plugin
+%bcond_with	mdb05		# build with mdb < 0.6pre1
 %bcond_without	mysql		# build without MySQL plugin
 %bcond_without	odbc		# build without unixODBC
 %bcond_without	pgsql		# build without PostgreSQL plugin
 %bcond_without	sqlite		# build without sqlite plugin
 %bcond_without	xbase		# build without xbase plugin
 
-%bcond_without	mdb06		# build without mdb-0.6pre1
 
 %ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
 %undefine	with_firebird
@@ -30,6 +30,8 @@
 Patch1:		%{name}-sqlite.patch
 Patch2:		%{name}-configure.patch
 Patch3:		%{name}-freetds064.patch
+Patch4:		%{name}-xbase.patch
+Patch5:		%{name}-mdb2.patch
 %{?with_firebird:BuildRequires:	Firebird-devel}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
@@ -45,8 +47,8 @@
 BuildRequires:	libxml2-devel >= 1:2.6.26
 BuildRequires:	libxslt-devel >= 1.1.17
 %if %{with_mdb}
-%{?with_mdb06:BuildRequires:	mdbtools-devel >= 0.6}
-%{!?with_mdb06:BuildRequires:	mdbtools-devel < 0.6}
+%{!?with_mdb05:BuildRequires:	mdbtools-devel >= 0.6}
+%{?with_mdb05:BuildRequires:	mdbtools-devel < 0.6}
 %endif
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ldap:BuildRequires:	openldap-devel}
@@ -252,12 +254,14 @@
 
 %prep
 %setup -q
-%if !%{with mdb06}
+%if %{with mdb05}
 %patch0 -p1
 %endif
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
@@ -409,6 +413,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2007/05/31 22:20:35  qboosh
+- updated freetds064 patch
+- readded xbase patch (now in version backported from libgda 3.0.1)
+- added mdb2 patch (one more mdb fix)
+- renamed bcond: without mdb06 -> with mdb05
+
 Revision 1.112  2007/05/13 18:14:49  qboosh
 - updated to 1.2.4
 - removed obsolete gcc34,freetds063 patches
@@ -433,4 +443,3 @@
 Revision 1.106  2006/08/11 18:33:16  freetz
 - merged from gda-1_2 branch, use HEAD deps, apidocs subpkg added,
   changelog cut, unstable version moved to DEVEL branch
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgda.spec?r1=1.112&r2=1.113&f=u