rpms/libgda/devel libgda-1.9.100-sharp.patch, 1.1, 1.2 libgda-1.9.100-syslibs.patch, 1.1, 1.2 libgda.spec, 1.10, 1.11

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	libgda-1.9.100-sharp.patch libgda-1.9.100-syslibs.patch 
	libgda.spec 
Log Message:
* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
- Bump release and rebuild for new gcc4.1 and glibc.
- Make sqlite plugin use system sqlite not build in version
- Make sqlite plugin a seperate package again
- Attempt to properly install C-sharp/mono bindings
- Add %{?dist} for consistency with my other packages
- Remove static lib from -devel package


libgda-1.9.100-sharp.patch:

Index: libgda-1.9.100-sharp.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-1.9.100-sharp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgda-1.9.100-sharp.patch	16 Jan 2006 22:04:11 -0000	1.1
+++ libgda-1.9.100-sharp.patch	14 Feb 2006 19:25:15 -0000	1.2
@@ -5,3 +5,23 @@
 -  <dllmap dll="gda-3" target="libgda-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
 +  <dllmap dll="gda-3" target="libgda-3 at LIB_PREFIX@.3 at LIB_SUFFIX@"/>
  </configuration>
+--- libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in~	2006-02-13 21:43:19.000000000 +0100
++++ libgda-1.9.100/gda-sharp/gda-sharp-2.0.pc.in	2006-02-13 21:59:35.000000000 +0100
+@@ -1,12 +1,12 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-pkglibdir=${libdir}/libgda
++libdir=${exec_prefix}/lib
++gapidir=${prefix}/share/gapi-2.0
++
+ 
+ Name: gda-sharp-2.0
+ Description: GDA (GNOME Data Access) library C# binding
+ Requires: gtk-sharp-2.0
+ Version: @VERSION@
+-Cflags: -I:${pkglibdir}/gda-api.xml
+-Libraries=${pkglibdir}/gda-sharp.dll ${pkglibdir}/gda-sharp.dll.config
+-Libs: -r:gda-sharp.dll
++Cflags: -I:${gapidir}/gda-api.xml
++Libs: -r:${libdir}/mono/gda-sharp-2.0/gda-sharp.dll

libgda-1.9.100-syslibs.patch:

Index: libgda-1.9.100-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda-1.9.100-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgda-1.9.100-syslibs.patch	13 Feb 2006 16:37:53 -0000	1.1
+++ libgda-1.9.100-syslibs.patch	14 Feb 2006 19:25:15 -0000	1.2
@@ -1,5 +1,122 @@
---- libgda-1.9.100/providers/sqlite/Makefile.am~	2006-02-13 17:31:19.000000000 +0100
-+++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 17:32:21.000000000 +0100
+--- libgda-1.9.100/libgda/gda-data-model-private.h.syslibs	2005-09-21 22:06:54.000000000 +0200
++++ libgda-1.9.100/libgda/gda-data-model-private.h	2006-02-13 23:01:32.000000000 +0100
+@@ -21,8 +21,8 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#if !defined(__gda_data_model_h__)
+-#  define __gda_data_model_h__
++#if !defined(__gda_data_model_private_h__)
++#  define __gda_data_model_private_h__
+ 
+ #include <glib-object.h>
+ #include <libxml/parser.h>
+--- libgda-1.9.100/providers/sqlite/utils.c.syslibs	2006-02-13 23:04:39.000000000 +0100
++++ libgda-1.9.100/providers/sqlite/utils.c	2006-02-13 23:06:30.000000000 +0100
+@@ -25,8 +25,8 @@
+ #include <libgda/gda-intl.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sqlite3.h>
+ #include "gda-sqlite.h"
+-#include "sqliteInt.h"
+ 
+ void
+ gda_sqlite_update_types_hash (SQLITEcnc *scnc)
+@@ -38,6 +38,7 @@
+ 		scnc->types = types;
+ 	}
+ 
++#if 0
+ 	if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 		Db *db;
+ 		gint i;
+@@ -86,6 +87,7 @@
+ 			}
+ 		}
+ 	}
++#endif	
+ }
+ 
+ void
+--- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c.syslibs	2005-09-28 13:39:45.000000000 +0200
++++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c	2006-02-13 23:01:32.000000000 +0100
+@@ -26,6 +26,8 @@
+ #endif
+ 
+ #include <stdlib.h>
++#include <string.h>
++#include <sqlite3.h>
+ #include <libgda/gda-intl.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <libgda/gda-data-model-private.h>
+@@ -33,7 +35,6 @@
+ #include "gda-sqlite.h"
+ #include "gda-sqlite-provider.h"
+ #include "gda-sqlite-recordset.h"
+-#include "sqliteInt.h"
+ 
+ static void gda_sqlite_provider_class_init (GdaSqliteProviderClass *klass);
+ static void gda_sqlite_provider_init       (GdaSqliteProvider *provider,
+@@ -260,6 +261,7 @@
+ 		}
+ 	}
+ 
++#if 0
+ 	if (0) {
+ 		/* show all databases in this handle */
+ 		Db *db;
+@@ -270,6 +272,7 @@
+ 			g_print ("/// %s\n", db->zName);
+ 		}
+ 	}
++#endif
+ 
+ 	return TRUE;
+ }
+@@ -1054,6 +1057,7 @@
+ 
+ 		/* extra attributes */
+ 		nvalue = NULL;
++#if 0
+ 		if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 			Table *table;
+ 				
+@@ -1066,6 +1070,7 @@
+ 			if ((table->iPKey == i) && table->autoInc)
+ 				nvalue = gda_value_new_string ("AUTO_INCREMENT");
+ 		}
++#endif
+ 
+ 		if (!nvalue)
+ 			nvalue = gda_value_new_null ();
+@@ -1155,7 +1160,7 @@
+ 		gda_connection_add_event_string (cnc, _("Invalid SQLITE handle"));
+ 		return NULL;
+ 	}
+-	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy);
++/*	g_assert ((scnc->connection->flags & SQLITE_Initialized) || scnc->connection->init.busy); */
+ 
+ 	/* create the recordset */
+ 	recset = GDA_DATA_MODEL_ARRAY (gda_data_model_array_new 
+@@ -1204,6 +1209,7 @@
+ 		g_assert (gda_provider_init_schema_model (GDA_DATA_MODEL (recset), GDA_CONNECTION_SCHEMA_PROCEDURES));
+ 	}
+ 
++#if 0
+ 	if (SQLITE_VERSION_NUMBER >= 3000000) {
+ 		Hash *func_hash;
+ 		HashElem *func_elem;
+@@ -1290,6 +1296,7 @@
+ 		g_list_foreach (list, add_g_list_row, recset);
+ 		g_list_free (list);
+ 	}
++#endif
+ 
+ 	return GDA_DATA_MODEL (recset);
+ }
+--- libgda-1.9.100/providers/sqlite/Makefile.am.syslibs	2005-06-01 21:14:12.000000000 +0200
++++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 23:01:32.000000000 +0100
 @@ -1,4 +1,4 @@
 -SUBDIRS = sqlite-src
 +SUBDIRS = 
@@ -15,3 +132,13 @@
 +	$(top_builddir)/libgda/libgda-3.la -lsqlite3
  
  EXTRA_DIST = $(config_DATA)
+--- libgda-1.9.100/configure.in.syslibs	2006-02-13 23:01:32.000000000 +0100
++++ libgda-1.9.100/configure.in	2006-02-13 23:01:32.000000000 +0100
+@@ -981,7 +981,6 @@
+ providers/oracle/Makefile
+ providers/postgres/Makefile
+ providers/sqlite/Makefile
+-providers/sqlite/sqlite-src/Makefile
+ providers/sybase/Makefile
+ providers/xbase/Makefile
+ report/Makefile


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgda.spec	13 Feb 2006 16:37:53 -0000	1.10
+++ libgda.spec	14 Feb 2006 19:25:15 -0000	1.11
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  3
+Release: 	  4%{?dist}
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -47,7 +47,7 @@
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
 BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
-BuildRequires:    sqlite-devel
+BuildRequires:	  sqlite-devel
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -105,6 +105,15 @@
 applications which use libgda.
 
 
+%package sqlite
+Summary:	libgda SQLite Provider
+Group:		System Environment/Libraries
+%description sqlite
+This package includes the libgda SQLite provider.
+Obsoletes:	gda-sqlite < %{epoch}:%{version}-%{release}
+Provides:	gda-sqlite = %{epoch}:%{version}-%{release}
+
+
 %if %{FREETDS}
 %package freetds
 Summary:	libgda FreeTDS Provider
@@ -195,6 +204,7 @@
 Provides:	gda-ldap = %{epoch}:%{version}-%{release}
 %endif
 
+
 %prep
 %setup -q
 rm -fr providers/sqlite/sqlite-src
@@ -202,6 +212,7 @@
 %patch1 -p1 -b .sharp
 %patch2 -p1 -b .syslibs
 
+
 %build
 aclocal
 automake
@@ -263,17 +274,26 @@
 %configure $CONFIG
 make
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall
 
+#fixup mono / sharp related files install
+mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
+mv %{buildroot}/%{_libdir}/libgda/gda-api.xml %{buildroot}/%{_datadir}/gapi-2.0
+mkdir -p %{buildroot}/usr/lib/mono/gda-sharp-2.0
+mv %{buildroot}/%{_libdir}/libgda/* %{buildroot}/usr/lib/mono/gda-sharp-2.0
+rmdir %{buildroot}/%{_libdir}/libgda
+
 # Cleanup unnecessary, unpackaged files
 rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la}
-rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.{a,la}
 rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db
 
 %find_lang libgda-3
 
+
 %post -p /sbin/ldconfig
 
 %post devel
@@ -298,7 +318,8 @@
 %{_libdir}/*.so.*
 %dir %{_libdir}/libgda-1.9
 %dir %{_libdir}/libgda-1.9/providers
-%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+# note this file really should be in its own subpackage too, but libgda
+# needs to have atleast one provider present to be of any use.
 %{_libdir}/libgda-1.9/providers/libgda-bdb.so
 %{_mandir}/man1/*
 %{_mandir}/man5/*
@@ -307,15 +328,19 @@
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgda
 %{_includedir}/*
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgda-2.0.pc
 
 %files sharp
 %defattr(-,root,root)
-%{_libdir}/libgda
+%{_datadir}/gapi-2.0
+/usr/lib/mono/gda-sharp-2.0
 %{_libdir}/pkgconfig/gda-sharp-2.0.pc
 
+%files sqlite
+%defattr(-,root,root)
+%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+
 %if %{FREETDS}
 %files freetds
 %defattr(-,root,root)
@@ -372,6 +397,14 @@
 
 
 %changelog
+* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
+- Bump release and rebuild for new gcc4.1 and glibc.
+- Make sqlite plugin use system sqlite not build in version
+- Make sqlite plugin a seperate package again
+- Attempt to properly install C-sharp/mono bindings
+- Add %%{?dist} for consistency with my other packages
+- Remove static lib from -devel package
+
 * Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
 - Make -sharp package Require the main package.