diff --git a/.cvsignore b/.cvsignore index 1d4c9ab..8e5f552 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgda-1.9.100.tar.bz2 +libgda-3.0.1.tar.bz2 diff --git a/import.log b/import.log new file mode 100644 index 0000000..5cfbb8d --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libgda-3_0_1-6_fc10:EL-5:libgda-3.0.1-6.fc10.src.rpm:1222110344 diff --git a/libgda-1.9.100-64bit.patch b/libgda-1.9.100-64bit.patch deleted file mode 100644 index 955839d..0000000 --- a/libgda-1.9.100-64bit.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 -+++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 -@@ -70,7 +70,7 @@ - return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; - } - --static GdaRow * -+GdaRow * - gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) - { - gint hash_entry; ---- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 -+++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE - -@@ -430,7 +431,7 @@ - } - - if (! cur) { -- g_set_error (error, 0, 0, _("No specified in "), node->name); -+ g_set_error (error, 0, 0, _("No specified in ")); - clean_field_specs (fields); - return NULL; - } ---- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 -+++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 -@@ -60,6 +60,7 @@ - gint rownum, - GdaRow *row); - -+GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); - - G_END_DECLS - ---- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 -+++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 -@@ -289,7 +289,7 @@ - break; - case GDA_VALUE_TYPE_BLOB : - blob = gda_postgres_blob_new (cnc); -- gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); -+ gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); - gda_value_set_blob (value, blob); - break; - default : ---- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 -+++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 -@@ -502,7 +502,7 @@ - return FALSE; - } - -- rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); -+ rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); - - if ( SQL_SUCCEEDED( rc )) { - return TRUE; ---- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 -+++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 -@@ -882,7 +882,7 @@ - { - GdaDataModel *model = NULL; - gchar *sql; -- gchar reference = NULL; -+ gchar *reference = NULL; - GList *reclist; - - /* use the SQLite PRAGMA command to get the list of FK keys for the table */ ---- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 -+++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 -@@ -24,6 +24,7 @@ - - #include - #include -+#include - #include "gda-sqlite.h" - #include "gda-sqlite-recordset.h" - #include "gda-sqlite-provider.h" ---- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 -+++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include "gda-bdb.h" - - const gchar *plugin_get_name (void); diff --git a/libgda-1.9.100-configure.patch b/libgda-1.9.100-configure.patch deleted file mode 100644 index 3cca824..0000000 --- a/libgda-1.9.100-configure.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libgda-1.3.4/configure.in.configure 2005-07-08 16:44:14.000000000 +0200 -+++ libgda-1.3.4/configure.in 2005-11-27 20:55:37.000000000 +0100 -@@ -250,9 +250,9 @@ - mysqldir="" - if test $try_mysql = true - then -- AC_PATH_PROG(MYSQL_CONFIG, mysql_config) -+ AC_PATH_PROG(MYSQL_CONFIG, mysql_config, 'no', [${libdir}/mysql3/mysql:$PATH]) - -- if test x$MYSQL_CONFIG = x; then -+ if test x$MYSQL_CONFIG = xno; then - AC_MSG_CHECKING(for MySQL files) - for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql - do diff --git a/libgda-1.9.100-sharp.patch b/libgda-1.9.100-sharp.patch deleted file mode 100644 index cb0115b..0000000 --- a/libgda-1.9.100-sharp.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in.sharp 2006-01-16 22:59:40.000000000 +0100 -+++ libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in 2006-01-16 23:00:11.000000000 +0100 -@@ -1,3 +1,3 @@ - -- -+ - ---- 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,14 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --pkglibdir=${libdir}/libgda -+pkglibdir=${prefix}/lib/mono/gda-sharp-2.0 -+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 -+Cflags: -I:${gapidir}/gda-api.xml - Libraries=${pkglibdir}/gda-sharp.dll ${pkglibdir}/gda-sharp.dll.config --Libs: -r:gda-sharp.dll -+Libs: -r:${pkglibdir}/gda-sharp.dll diff --git a/libgda-1.9.100-syslibs.patch b/libgda-1.9.100-syslibs.patch deleted file mode 100644 index 0667cf7..0000000 --- a/libgda-1.9.100-syslibs.patch +++ /dev/null @@ -1,144 +0,0 @@ ---- 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 - #include ---- 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 - #include - #include -+#include - #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 -+#include -+#include - #include - #include - #include -@@ -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 = - - providerdir=$(libdir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/providers - provider_LTLIBRARIES = libgda-sqlite.la -@@ -27,7 +27,6 @@ - libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version - libgda_sqlite_la_LIBADD = \ - $(LIBGDA_LIBS) \ -- $(top_builddir)/libgda/libgda-3.la \ -- $(top_builddir)/providers/sqlite/sqlite-src/libsqlite.la -+ $(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 diff --git a/libgda-3.0.0-man.patch b/libgda-3.0.0-man.patch new file mode 100644 index 0000000..c1f40d6 --- /dev/null +++ b/libgda-3.0.0-man.patch @@ -0,0 +1,121 @@ +--- libgda-3.0.0/tools/gda-config-3.0.5.man 2007-04-24 09:42:36.000000000 +0200 ++++ libgda-3.0.0/tools/gda-config-3.0.5 2007-04-24 09:42:05.000000000 +0200 +@@ -0,0 +1,52 @@ ++.\" ++.\" gda-config man page ++.\" (C) 2003 GNOME Foundation ++.\" Author: ++.\" Gonzalo Paniagua Javier (gonzalo@gnome-db.org) ++.\" ++.TH gda-config-3.0 "5" "January 2003" "libgda" "File Formats" ++.SH NAME ++$(sysconfdir)/libgda/config \- libgda global configuration file. ++$(HOME)/.libgda/config \- libgda user configuration file. ++.SH DESCRIPTION ++The config file of libgda is an XML file. The document starts with ++ tag, which contains sections that hold the configured ++database providers for libgda. ++.PP ++The values in the global configuration file are overriden by the ones in the ++user configuration file. ++.PP ++Each
has a 'path' attribute whose value \fImust\fP be something like ++"/apps/libgda/Datasources/XXXXXXXX", where XXXXXXXX is the name of the ++database backend (i.e., postgres, mysql,...) ++.PP ++Inside each
you can have for tags with 'name', 'type' and 'value' ++attributes. Valid values for 'name' are: \fIProvider\fP, ++\fIUsername\fP, \fIDSN\fP and \fIDescription\fP. 'type' value is always ++"string" and 'value' contains the value for the given 'name'. ++.SH EXAMPLE ++This is a sample file. You may modify it manually, add/remove sections,... ++.RS ++.sp ++.nf ++ ++ ++
++ ++ ++ ++ ++
++ ++.fi ++.sp ++.RE ++You can also use \fBgda-config-tool-3.0\fR or \fBmergeant\fR (recommended) to modify ++this file. ++.SH SEE ALSO ++.BR mergeant (1), ++.BR gda-config-tool-3.0 (1) ++ ++ +--- libgda-3.0.0/tools/gda-config-tool-3.0.1.man 2007-04-24 09:42:41.000000000 +0200 ++++ libgda-3.0.0/tools/gda-config-tool-3.0.1 2007-04-24 09:41:43.000000000 +0200 +@@ -0,0 +1,63 @@ ++.\" ++.\" gda-config-tool man page ++.\" (C) 2002 GNOME Foundation ++.\" Author: ++.\" Gonzalo Paniagua Javier (gonzalo@gnome-db.org) ++.\" ++.TH gda-config-tool-3.0 "1" "October 2002" "gda-config-tool-3.0 (libgda)" "User Commands" ++.SH NAME ++gda-config-tool-3.0 \- Tool for managing libgda configuration file. ++.SH SYNOPSIS ++.PP ++.B gda-config-tool-3.0 [OPTIONS] ++.SH DESCRIPTION ++The \fIgda-config-tool-3.0\fP program can be used create/edit/remove a libgda ++provider. It can be used both as a command line program and an interactive ++program. ++.SH OPTIONS ++.PP ++The following options are supported: ++.TP ++\fB\-?\fR, \fB\-\-help\fR ++Displays command line options. ++.TP ++\fB--usage\fR ++Display brief usage message. ++.TP ++\fB--l\fR, \fB\-\-list\-providers\fR ++Lists installed providers. ++.TP ++\fB--L\fR, \fB\-\-list\-datasources\fR ++Lists configured data sources. ++.TP ++\fB--n\fR, \fB\-\-name=NAME\fR ++User-assigned name for the provider and connection settings. ++.TP ++\fB--u\fR, \fB\-\-user=NAME\fR ++User name to pass to the provider when connecting. ++.TP ++\fB--p\fR, \fB\-\-password=NAME\fR ++Password for the given user to pass to the DB backend. ++.TP ++\fB--P\fR, \fB\-\-provider=NAME\fR ++Provider name. ++.TP ++\fB--d\fR, \fB\-\-DSN="NAME=VALUE;..."\fR ++Semi-colon separated list of parameter=value option to pass to the provider. ++.SH ENVIRONMENT VARIABLES ++.TP ++NONE ++.SH FILES ++.PP ++$(sysconfdir)/libgda/config ++.IP ++Global configurations settings read for every user. ++.PP ++${HOME}/.libgda/config ++.IP ++User settings. Override global settings. ++.SH SEE ALSO ++.BR mergeant(1), ++.BR gda-config-3.0(5) ++ ++ diff --git a/libgda-3.0.1-detect-sqlite.patch b/libgda-3.0.1-detect-sqlite.patch new file mode 100644 index 0000000..54b8924 --- /dev/null +++ b/libgda-3.0.1-detect-sqlite.patch @@ -0,0 +1,31 @@ +diff -up libgda-3.0.1/configure.in~ libgda-3.0.1/configure.in +--- libgda-3.0.1/configure.in~ 2007-08-08 11:25:16.000000000 +0200 ++++ libgda-3.0.1/configure.in 2007-08-08 11:25:16.000000000 +0200 +@@ -925,9 +925,10 @@ PKG_CHECK_MODULES(SQLITE, $SQLITE_MODULE + if test x"$have_sqlite" = "xyes" + then + realvers=`sqlite3 -version` ++ minorvers=`sqlite3 -version | cut -d '.' -f 2` + microvers=`sqlite3 -version | cut -d '.' -f 3` + AC_MSG_CHECKING(for sqlite version) +- if test $microvers -lt 100 ++ if test $minorvers -lt 4 -a $microvers -lt 100 + 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; } diff --git a/libgda-3.0.1-ldap.patch b/libgda-3.0.1-ldap.patch new file mode 100644 index 0000000..c5a2c3c --- /dev/null +++ b/libgda-3.0.1-ldap.patch @@ -0,0 +1,11 @@ +--- libgda-3.0.1/providers/ldap/gda-ldap.h~ 2007-05-27 21:03:31.000000000 +0200 ++++ libgda-3.0.1/providers/ldap/gda-ldap.h 2007-05-27 21:03:31.000000000 +0200 +@@ -32,6 +32,8 @@ + #include + #include + #include "gda-ldap-provider.h" ++/* we use the old API (time to update) */ ++#define LDAP_DEPRECATED 1 + #include + #include + diff --git a/libgda-3.0.1-mdb-64bit.patch b/libgda-3.0.1-mdb-64bit.patch new file mode 100644 index 0000000..293fe16 --- /dev/null +++ b/libgda-3.0.1-mdb-64bit.patch @@ -0,0 +1,20 @@ +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 ++#include + + 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; diff --git a/libgda.spec b/libgda.spec index af7cde5..d9b4b1b 100644 --- a/libgda.spec +++ b/libgda.spec @@ -1,61 +1,70 @@ -# Default provider build options (MySQL, Postgres & unixODBC) +# Default provider build options (MySQL, Postgres, unixODBC, LDAP, FreeTDS) # # Package build options: -# --with tds # --with db2 # --with oracle # --with sybase -# --with mdb # --without ldap +# --without mdb # --without mysql # --without odbc # --without postgres +# --without tds +# --without xbase # -%define FREETDS 0 %define IBMDB2 0 +%define ORACLE 0 +%define SYBASE 0 +%define LDAP 1 +%define MDB 1 %define MYSQL 1 %define ODBC 1 -%define ORACLE 0 %define POSTGRES 1 -%define SYBASE 0 -%define MDB 0 -%define LDAP 1 - -%{?_with_tds:%define FREETDS 1} -%{?_with_db2:%define IBMDB2 1} -%{?_with_mdb:%define MDB 1} -%{?_with_oracle:%define ORACLE 1} -%{?_with_sybase:%define SYBASE 1} -%{?_without_ldap:%define LDAP 0} +%define FREETDS 1 +%define XBASE 1 + +%{?_with_db2:%define IBMDB2 1} +%{?_with_oracle:%define ORACLE 1} +%{?_with_sybase:%define SYBASE 1} +%{?_without_ldap:%define LDAP 0} +%{?_without_mdb:%define MDB 0} %{?_without_mysql:%define MYSQL 0} -%{?_without_odbc:%define ODBC 0} -%{?_without_postgres:%define POSTGRES 0} +%{?_without_odbc:%define ODBC 0} +%{?_without_postgres:%define POSTGRES 0} +%{?_without_tds:%define FREETDS 0} +%{?_without_xbase:%define XBASE 0} -Summary: Library for writing gnome database programs Name: libgda -Version: 1.9.100 -Release: 10%{?dist} Epoch: 1 -Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2 -URL: http://www.gnome-db.org/ +Version: 3.0.1 +Release: 6%{?dist} +Summary: Library for writing gnome database programs Group: System Environment/Libraries -License: LGPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +License: LGPLv2+ +URL: http://www.gnome-db.org/ +Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 +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: libxml2-devel ncurses-devel sqlite-devel readline-devel -BuildRequires: db4-devel mono-devel gtk-sharp2-devel gtk-sharp2-gapi -BuildRequires: gamin-devel gtk-doc scrollkeeper groff gettext flex bison -BuildRequires: intltool automake libtool +BuildRequires: sqlite-devel >= 3.4.0 +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} %if %{FREETDS} BuildRequires: freetds-devel %endif %if %{MYSQL} -BuildRequires: mysqlclient10-devel +BuildRequires: mysql-devel %endif %if %{POSTGRES} @@ -67,17 +76,16 @@ BuildRequires: unixODBC-devel %endif %if %{MDB} -BuildRequires: mdbtools-devel +BuildRequires: mdbtools-devel %endif %if %{LDAP} -BuildRequires: openldap-devel +BuildRequires: openldap-devel %endif -Patch0: libgda-1.9.100-configure.patch -Patch1: libgda-1.9.100-sharp.patch -Patch2: libgda-1.9.100-syslibs.patch -Patch3: libgda-1.9.100-64bit.patch +%if %{XBASE} +BuildRequires: xbase-devel +%endif %description libgda is a library that eases the task of writing @@ -89,137 +97,237 @@ Summary: Development libraries and header files for libgda Group: Development/Libraries Requires: glib2-devel >= 2.0.0 Requires: libxslt-devel >= 1.0.9 -Requires: db4-devel libxml2-devel -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: db4-devel libxml2-devel pkgconfig +Requires: %{name} = %{epoch}:%{version}-%{release} %description devel This package contains the header files and libraries needed to write or compile programs that use libgda. -%package sharp -Summary: Mono bindings for libgda +%package sqlite +Summary: SQLite provider for libgda Group: System Environment/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} - -%description sharp -This package contains the dll files needed to run (and compile) Mono -applications which use libgda. - - -%package sqlite -Summary: libgda SQLite Provider -Group: System Environment/Libraries -Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} -Provides: gda-sqlite = %{epoch}:%{version}-%{release} +Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release} +Provides: gda-sqlite = %{epoch}:%{version}-%{release} %description sqlite This package includes the libgda SQLite provider. +%package sqlite-devel +Summary: SQLite provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-sqlite = %{epoch}:%{version}-%{release} +%description sqlite-devel +This package includes the pkgconfig file for the libgda SQLite provider. + %if %{FREETDS} %package freetds -Summary: libgda FreeTDS Provider -Group: System Environment/Libraries -Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} -Provides: gda-freetds = %{epoch}:%{version}-%{release} +Summary: FreeTDS provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-freetds < %{epoch}:%{version}-%{release} +Provides: gda-freetds = %{epoch}:%{version}-%{release} %description freetds This package includes the libgda FreeTDS provider. + +%package freetds-devel +Summary: FreeTDS provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-freetds = %{epoch}:%{version}-%{release} +%description freetds-devel +This package includes the pkgconfig file for the libgda FreeTDS provider. %endif %if %{IBMDB2} %package ibmdb2 -Summary: libgda IBM DB2 Provider -Group: System Environment/Libraries -Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} -Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} +Summary: IBM DB2 provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release} +Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release} %description ibmdb2 This package includes the libgda IBM DB2 provider. + +%package ibmdb2-devel +Summary: IBM DB2 provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-ibmdb2 = %{epoch}:%{version}-%{release} +%description ibmdb2-devel +This package includes the pkgconfig file for the libgda IBM DB2 provider. %endif %if %{MYSQL} %package mysql -Summary: libgda MySQL Provider -Group: System Environment/Libraries -Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} -Provides: gda-mysql = %{epoch}:%{version}-%{release} +Summary: MySQL provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-mysql < %{epoch}:%{version}-%{release} +Provides: gda-mysql = %{epoch}:%{version}-%{release} %description mysql This package includes the libgda MySQL provider. + +%package mysql-devel +Summary: MySQL provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-mysql = %{epoch}:%{version}-%{release} +%description mysql-devel +This package includes the pkgconfig file for the libgda MySQL provider. %endif %if %{ODBC} %package odbc -Summary: libgda ODBC Provider -Group: System Environment/Libraries -Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} -Provides: gda-odbc = %{epoch}:%{version}-%{release} +Summary: ODBC provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-odbc < %{epoch}:%{version}-%{release} +Provides: gda-odbc = %{epoch}:%{version}-%{release} %description odbc This package includes the libgda ODBC provider. + +%package odbc-devel +Summary: ODBC provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-odbc = %{epoch}:%{version}-%{release} +%description odbc-devel +This package includes the pkgconfig file for the libgda ODBC provider. %endif %if %{ORACLE} %package oracle -Summary: libgda Oracle Provider -Group: System Environment/Libraries -Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} -Provides: gda-oracle = %{epoch}:%{version}-%{release} +Summary: Oracle provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-oracle < %{epoch}:%{version}-%{release} +Provides: gda-oracle = %{epoch}:%{version}-%{release} %description oracle This package includes the libgda Oracle provider. + +%package oracle-devel +Summary: Oracle provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-oracle = %{epoch}:%{version}-%{release} +%description oracle-devel +This package includes the pkgconfig file for the libgda Oracle provider. %endif %if %{POSTGRES} %package postgres -Summary: libgda PostgreSQL Provider -Group: System Environment/Libraries -Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} -Provides: gda-postgres = %{epoch}:%{version}-%{release} +Summary: PostgreSQL provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-postgres < %{epoch}:%{version}-%{release} +Provides: gda-postgres = %{epoch}:%{version}-%{release} %description postgres This package includes the libgda PostgreSQL provider. + +%package postgres-devel +Summary: PostgreSQL provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-postgres = %{epoch}:%{version}-%{release} +%description postgres-devel +This package includes the pkgconfig file for the libgda PostgreSQL provider. %endif %if %{SYBASE} %package sybase -Summary: libgda Sybase Provider -Group: System Environment/Libraries -Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} -Provides: gda-sybase = %{epoch}:%{version}-%{release} +Summary: Sybase provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-sybase < %{epoch}:%{version}-%{release} +Provides: gda-sybase = %{epoch}:%{version}-%{release} %description sybase This package includes the libgda Sybase provider. + +%package sybase-devel +Summary: Sybase provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-sybase = %{epoch}:%{version}-%{release} +%description sybase-devel +This package includes the pkgconfig file for the libgda Sybase provider. %endif %if %{MDB} %package mdb -Summary: libgda MDB Provider -Group: System Environment/Libraries -Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} -Provides: gda-mdb = %{epoch}:%{version}-%{release} +Summary: MDB provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-mdb < %{epoch}:%{version}-%{release} +Provides: gda-mdb = %{epoch}:%{version}-%{release} %description mdb This package includes the libgda MDB provider. -%endif +%package mdb-devel +Summary: MDB provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-mdb = %{epoch}:%{version}-%{release} +%description mdb-devel +This package includes the pkgconfig file for the libgda MDB provider. +%endif + %if %{LDAP} %package ldap -Summary: libgda LDAP Provider -Group: System Environment/Libraries -Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} -Provides: gda-ldap = %{epoch}:%{version}-%{release} +Summary: LDAP provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: gda-ldap < %{epoch}:%{version}-%{release} +Provides: gda-ldap = %{epoch}:%{version}-%{release} %description ldap This package includes the libgda LDAP provider. + +%package ldap-devel +Summary: LDAP provider for libgda pkgconfig file +Group: Development/Libraries +Requires: pkgconfig +Requires: %{name}-ldap = %{epoch}:%{version}-%{release} +%description ldap-devel +This package includes the pkgconfig file for the libgda LDAP provider. +%endif + +%if %{XBASE} +%package xbase +Summary: XBASE provider for libgda +Group: System Environment/Libraries +Requires: %{name} = %{epoch}:%{version}-%{release} +%description xbase +This package includes the GDA XBASE provider. + +%package xbase-devel +Summary: XBASE provider for libgda pkgconfig file +Group: Development/Libraries +Requires: %{name}-xbase = %{epoch}:%{version}-%{release}, pkgconfig +%description xbase-devel +This package includes the pkgconfig file for the libgda XBASE provider. %endif %prep %setup -q -rm -fr providers/sqlite/sqlite-src -%patch0 -p1 -b .configure -%patch1 -p1 -b .sharp -%patch2 -p1 -b .syslibs -%patch3 -p1 -b .64bit +%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 configure.in +# stop autoxxx rerunning because of our patches above +touch aclocal.m4 +touch `find -name Makefile.in` %build -aclocal -automake -autoconf +CONFIG="--disable-static --disable-dependency-tracking" + %if %{FREETDS} CONFIG="$CONFIG --with-tds" %else @@ -274,27 +382,32 @@ CONFIG="$CONFIG --with-ldap" CONFIG="$CONFIG --without-ldap" %endif +%if %{XBASE} +CONFIG="$CONFIG --with-xbase" +%else +CONFIG="$CONFIG --without-xbase" +%endif + %configure $CONFIG -make +# Don't use rpath! +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# work around gda-report-test-3.0 linking failing because of the disabling of +# rpath above +export LD_LIBRARY_PATH=`pwd`/libsql/.libs +make %{?_smp_mflags} %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 +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT # Cleanup unnecessary, unpackaged files -rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la} -rm -f %{buildroot}/%{_libdir}/*.{a,la} -rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db +rm $RPM_BUILD_ROOT/%{_libdir}/libgda-3.0/providers/*.la +rm $RPM_BUILD_ROOT/%{_libdir}/*.la +rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-3.0/sales_test.db -%find_lang libgda-3 +%find_lang libgda-3.0 %post -p /sbin/ldconfig @@ -307,99 +420,179 @@ if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi %postun devel if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi + %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT -%files -f libgda-3.lang -%defattr(-,root,root) + +%files -f libgda-3.0.lang +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README NEWS -#%doc %{_datadir}/gnome/help/libgda -%dir %{_sysconfdir}/libgda -%config(noreplace) %{_sysconfdir}/libgda/config +%config(noreplace) %{_sysconfdir}/libgda-3.0 %{_bindir}/* -%{_datadir}/libgda +%{_datadir}/libgda-3.0 %{_libdir}/*.so.* -%dir %{_libdir}/libgda-1.9 -%dir %{_libdir}/libgda-1.9/providers +%dir %{_libdir}/libgda-3.0 +%dir %{_libdir}/libgda-3.0/providers # 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 +%{_libdir}/libgda-3.0/providers/libgda-bdb.so %{_mandir}/man1/* %{_mandir}/man5/* %files devel -%defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/libgda +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/libgda-3.0 %{_includedir}/* %{_libdir}/*.so -%{_libdir}/pkgconfig/libgda-2.0.pc - -%files sharp -%defattr(-,root,root) -%{_datadir}/gapi-2.0 -/usr/lib/mono/gda-sharp-2.0 -%{_libdir}/pkgconfig/gda-sharp-2.0.pc +%{_libdir}/pkgconfig/libgda-3.0.pc +%{_libdir}/pkgconfig/libgda-bdb-3.0.pc %files sqlite -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-sqlite.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-sqlite.so + +%files sqlite-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-sqlite-3.0.pc %if %{FREETDS} %files freetds -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-freetds.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-freetds.so + +%files freetds-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-freetds-3.0.pc %endif %if %{IBMDB2} %files ibmdb2 -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-ibmdb2.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-ibmdb2.so + +%files ibmdb2-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-imdb2-3.0.pc %endif %if %{MYSQL} %files mysql -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-mysql.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-mysql.so + +%files mysql-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-mysql-3.0.pc %endif %if %{ODBC} %files odbc -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-odbc.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-odbc.so + +%files odbc-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-odbc-3.0.pc %endif %if %{ORACLE} %files oracle -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-oracle.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-oracle.so + +%files oracle-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-oracle-3.0.pc %endif %if %{POSTGRES} %files postgres -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-postgres.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-postgres.so + +%files postgres-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-postgres-3.0.pc %endif %if %{SYBASE} %files sybase -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-sybase.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-sybase.so + +%files sybase-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-sybase-3.0.pc %endif %if %{MDB} %files mdb -%defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-mdb.so +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-mdb.so + +%files mdb-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-mdb-3.0.pc %endif %if %{LDAP} %files ldap +%defattr(-,root,root,-) +%{_libdir}/libgda-3.0/providers/libgda-ldap.so + +%files ldap-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-ldap-3.0.pc +%endif + +%if %{XBASE} +%files xbase %defattr(-,root,root) -%{_libdir}/libgda-1.9/providers/libgda-ldap.so +%{_libdir}/libgda-3.0/providers/libgda-xbase.so + +%files xbase-devel +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/libgda-xbase-3.0.pc %endif %changelog +* Thu Dec 06 2007 Release Engineering - 3.0.1-6 +- Rebuild for deps + +* Sun Oct 21 2007 Hans de Goede 1:3.0.1-5 +- Rebuild to fix untranslated strings on x86_64 in + /usr/share/libgda-3.0/sqlite_specs_drop_index.xml + which caused multilib problems (bz 342101) + +* Fri Aug 17 2007 Hans de Goede 1:3.0.1-4 +- Fix building on ppc64 again (patch configure not configure.in, now we are + no longer running autoconf) + +* Wed Aug 15 2007 Hans de Goede 1:3.0.1-3 +- Enable microsoft access (mdb) support now that mdbtools is in Fedora +- Enable xBase (dBase, Clipper, FoxPro) support, it seems that xbase has been + available for quite a while now +- Switch from using mysqlclient10 to using mysql-libs for the msql provider + +* Wed Aug 8 2007 Hans de Goede 1:3.0.1-2 +- Build against system sqlite instead of own private copy (this is possible now + that the system sqlite is of a high enough version) +- Enable FreeTDS provider (FreeTDS is in Fedora now) +- Update License tag for new Licensing Guidelines compliance + +* Sun May 27 2007 Hans de Goede 1:3.0.1-1 +- New upstream release 3.0.1 +- Remove mono bindings sub-package as upstream no longer includes them + +* Thu May 10 2007 Hans de Goede 1:1.9.100-12 +- Don't build mono/sharp bits on ppc64 +- Fixup packaging of sharp bindings to match the mono packaging guidelines + +* Fri Dec 15 2006 Hans de Goede 1:1.9.100-11 +- Rebuild for new postgres + * Mon Aug 28 2006 Hans de Goede 1:1.9.100-10 - FE6 Rebuild diff --git a/sources b/sources index 6c30987..7d23d12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c943610dc4c9c286bb14d6ce3c6e549b libgda-1.9.100.tar.bz2 +1aaf23c27ba94d0b231f2b123350110a libgda-3.0.1.tar.bz2