rpms/libgda/devel libgda-3.0.1-mdb-64bit.patch, NONE, 1.1 libgda-3.0.1-detect-sqlite.patch, 1.1, 1.2 libgda.spec, 1.29, 1.30 libgda-1.9.100-configure.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18112

Modified Files:
	libgda-3.0.1-detect-sqlite.patch libgda.spec 
Added Files:
	libgda-3.0.1-mdb-64bit.patch 
Removed Files:
	libgda-1.9.100-configure.patch 
Log Message:
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-3
- Enable microsoft access (mdb) support now that mdbtools is in Fedora


libgda-3.0.1-mdb-64bit.patch:

--- NEW FILE libgda-3.0.1-mdb-64bit.patch ---
diff -up libgda-3.0.1/providers/mdb/gda-mdb-table.c~ libgda-3.0.1/providers/mdb/gda-mdb-table.c
--- libgda-3.0.1/providers/mdb/gda-mdb-table.c~	2007-08-16 13:36:34.000000000 +0200
+++ libgda-3.0.1/providers/mdb/gda-mdb-table.c	2007-08-16 13:36:34.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "gda-mdb-table.h"
 #include <libgda/gda-data-model-private.h>
+#include <libgda/gda-data-model-array.h>
 
 GdaDataModel *
 gda_mdb_table_new (GdaMdbConnection *mdb_cnc, const gchar *name)
@@ -40,7 +41,7 @@ gda_mdb_table_new (GdaMdbConnection *mdb
 	for (i = 0; i < mdb_cnc->mdb->num_catalog; i++) {
 		entry = g_ptr_array_index (mdb_cnc->mdb->catalog, i);
 		if (entry->object_type == MDB_TABLE
-		    && !strcmp (entry->object_type, name))
+		    && !strcmp (entry->object_name, name))
 			break;
 		else
 			entry = NULL;

libgda-3.0.1-detect-sqlite.patch:

Index: libgda-3.0.1-detect-sqlite.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-3.0.1-detect-sqlite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgda-3.0.1-detect-sqlite.patch	8 Aug 2007 11:03:13 -0000	1.1
+++ libgda-3.0.1-detect-sqlite.patch	16 Aug 2007 11:50:33 -0000	1.2
@@ -13,3 +13,19 @@
          then
                  AC_MSG_RESULT(Version $realvers of SQLite does not implement required pragmas, using embedded SQLite)
                  have_sqlite=no
+diff -up libgda-3.0.1/configure.sqlite libgda-3.0.1/configure
+--- libgda-3.0.1/configure.sqlite	2007-05-04 23:42:33.000000000 +0200
++++ libgda-3.0.1/configure	2007-08-16 13:18:24.000000000 +0200
+@@ -24884,10 +24884,11 @@ fi
+ if test x"$have_sqlite" = "xyes"
+ then
+         realvers=`sqlite3 -version`
++        minorvers=`sqlite3 -version | cut -d '.' -f 2`
+         microvers=`sqlite3 -version | cut -d '.' -f 3`
+         { echo "$as_me:$LINENO: checking for sqlite version" >&5
+ echo $ECHO_N "checking for sqlite version... $ECHO_C" >&6; }
+-        if test $microvers -lt 100
++        if test $minorvers -lt 4 -a $microvers -lt 100
+         then
+                 { echo "$as_me:$LINENO: result: Version $realvers of SQLite does not implement required pragmas" >&5
+ echo "${ECHO_T}Version $realvers of SQLite does not implement required pragmas" >&6; }


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libgda.spec	15 Aug 2007 20:58:26 -0000	1.29
+++ libgda.spec	16 Aug 2007 11:50:33 -0000	1.30
@@ -41,18 +41,17 @@
 License:          LGPLv2+
 URL:              http://www.gnome-db.org/
 Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
-Patch0:           libgda-1.9.100-configure.patch
 Patch1:           libgda-3.0.0-man.patch
 Patch2:           libgda-3.0.1-ldap.patch
 Patch3:           libgda-3.0.1-detect-sqlite.patch
+Patch4:           libgda-3.0.1-mdb-64bit.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.0.0
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    sqlite-devel >= 3.4.0
-BuildRequires:    libxml2-devel ncurses-devel readline-devel
-BuildRequires:    db4-devel gamin-devel gtk-doc scrollkeeper groff gettext
-BuildRequires:    flex bison intltool autoconf
+BuildRequires:    libxml2-devel readline-devel db4-devel gamin-devel
+BuildRequires:    gtk-doc scrollkeeper gettext flex bison perl(XML::Parser)
 # note we do not provide these, they no longer exist
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
 Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
@@ -62,7 +61,7 @@
 %endif
 
 %if %{MYSQL}
-BuildRequires:    mysqlclient10-devel
+BuildRequires:    mysql-devel
 %endif
 
 %if %{POSTGRES}
@@ -291,19 +290,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .configure
 %patch1 -p1 -b .man
 %patch2 -p1 -b .ldap
 %patch3 -p1 -b .sqlite
+%patch4 -p1 -b .64bit
 # fix ppc64 postgres detection
 sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
   configure.in
-# <sigh> there is no need to run aclocal or automake again, this only causes
-# problems (like getting intltool 0.36 m4 code in configure, while using
-# 0.30 .in files to generate intltool)
+# stop autoxxx rerunning because of our patches above
 touch aclocal.m4
 touch `find -name Makefile.in`
-autoconf
 
 
 %build


--- libgda-1.9.100-configure.patch DELETED ---