rpms/libgda/devel libgda-1.2.0-libdir.patch, NONE, 1.1 libgda.spec, 1.3, 1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	libgda.spec 
Added Files:
	libgda-1.2.0-libdir.patch 
Log Message:
- Added Patch4: libgda-1.2.0-libdir.patch which fixes loading of
  database providers on platforms with a lib64 dir. Thanks to:
  Bas Driessen <bas.driessen at xobas.com> for the patch.
- Enabled building of libgda-ldap and libgda-sqlite by default.


libgda-1.2.0-libdir.patch:

--- NEW FILE libgda-1.2.0-libdir.patch ---
--- libgda-1.2.0/libgda/Makefile.am.orig	2005-06-24 23:46:29.000000000 +1000
+++ libgda-1.2.0/libgda/Makefile.am	2005-06-24 23:47:54.000000000 +1000
@@ -4,7 +4,7 @@
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS) \
-	-DLIBGDA_PLUGINDIR=\""$(prefix)/lib/libgda/providers"\" \
+	-DLIBGDA_PLUGINDIR=\""$(libdir)/libgda/providers"\" \
 	-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" \
 	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
 


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgda.spec	21 Jun 2005 10:52:17 -0000	1.3
+++ libgda.spec	25 Jun 2005 19:09:54 -0000	1.4
@@ -4,10 +4,10 @@
 # --with tds
 # --with db2
 # --with oracle
-# --with sqlite
 # --with sybase
 # --with mdb
-# --with ldap
+# --without sqlite
+# --without ldap
 # --without mysql
 # --without odbc
 # --without postgres
@@ -19,18 +19,18 @@
 %define           ODBC     1
 %define           ORACLE   0
 %define           POSTGRES 1
-%define           SQLITE   0
+%define           SQLITE   1
 %define           SYBASE   0
 %define 	  MDB	   0
-%define		  LDAP	   0
+%define		  LDAP	   1
 
 %{?_with_tds:%define FREETDS 	1}
 %{?_with_db2:%define IBMDB2 	1}
-%{?_with_ldap:%define LDAP 	1}
 %{?_with_mdb:%define MDB 	1}
 %{?_with_oracle:%define ORACLE 	1}
-%{?_with_sqlite:%define SQLITE 	1}
 %{?_with_sybase:%define SYBASE 	1}
+%{?_without_sqlite:%define SQLITE 	0}
+%{?_without_ldap:%define LDAP 	0}
 %{?_without_mysql:%define MYSQL 0}
 %{?_without_odbc:%define ODBC 	0}
 %{?_without_postgres:%define POSTGRES 	0}
@@ -38,7 +38,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.2.0
-Release: 	  6
+Release: 	  7
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -76,7 +76,7 @@
 %endif
 
 %if %{SQLITE}
-BuildRequires:	  sqlite-devel
+BuildRequires:	  sqlite2-devel
 %endif
 
 %if %{MDB}
@@ -91,6 +91,7 @@
 Patch1: libgda-1.2.0-gnome162569.patch
 Patch2: libgda-1.2.0-gnomeXXXXXX.patch
 Patch3: libgda-1.2.0-64bitgnomeXXXXXX.patch
+Patch4: libgda-1.2.0-libdir.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -216,6 +217,7 @@
 %patch1 -p1 -b .gnome162569
 %patch2 -p1 -b .gnomeXXXXXX
 %patch3 -p1 -b .64bitgnomeXXXXXX.patch
+%patch4 -p1 -b .libdir
 
 %build
 aclocal
@@ -394,6 +396,12 @@
 
 
 %changelog
+* Sat Jun 25 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.2.0-7
+- Added Patch4: libgda-1.2.0-libdir.patch which fixes loading of
+  database providers on platforms with a lib64 dir. Thanks to:
+  Bas Driessen <bas.driessen at xobas.com> for the patch.
+- Enabled building of libgda-ldap and libgda-sqlite by default.
+
 * Tue Jun 21 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.2.0-6
 - rebuild so that we depend on the proper version of libpq.so (#160917)
 - change names of database providers from gda-xxx to libgda-xxx (#160917)