[compat-libgda] glib2 fixes.
Jon Ciesla
limb at fedoraproject.org
Tue Jan 24 15:47:41 UTC 2012
commit 36a600042c8d74cc263095d37b40def071d1296b
Author: Jon Ciesla <limburgher at gmail.com>
Date: Tue Jan 24 09:47:21 2012 -0600
glib2 fixes.
compat-libgda-3.1.2-glib2.patch | 472 +++++++++++++++++++++++++++++++++++++++
compat-libgda.spec | 7 +-
2 files changed, 478 insertions(+), 1 deletions(-)
---
diff --git a/compat-libgda-3.1.2-glib2.patch b/compat-libgda-3.1.2-glib2.patch
new file mode 100644
index 0000000..9c79241
--- /dev/null
+++ b/compat-libgda-3.1.2-glib2.patch
@@ -0,0 +1,472 @@
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-column.c libgda-3.1.2/libgda/gda-column.c
+--- libgda-3.1.2.orig/libgda/gda-column.c 2007-08-29 07:46:50.000000000 -0500
++++ libgda-3.1.2/libgda/gda-column.c 2012-01-24 09:17:49.197842711 -0600
+@@ -23,8 +23,8 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
++#include <glib.h>
+ #include <libgda/gda-column.h>
+ #include <string.h>
+ #include "gda-marshal.h"
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-column.h libgda-3.1.2/libgda/gda-column.h
+--- libgda-3.1.2.orig/libgda/gda-column.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-column.h 2012-01-24 09:17:50.683031469 -0600
+@@ -28,7 +28,7 @@
+
+ #include <glib-object.h>
+ #include <libgda/gda-value.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+
+ G_BEGIN_DECLS
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-command.c libgda-3.1.2/libgda/gda-command.c
+--- libgda-3.1.2.orig/libgda/gda-command.c 2007-09-27 08:30:15.000000000 -0500
++++ libgda-3.1.2/libgda/gda-command.c 2012-01-24 09:17:55.558651136 -0600
+@@ -21,9 +21,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
+ #include <libgda/gda-command.h>
+
+ GType
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-command.h libgda-3.1.2/libgda/gda-command.h
+--- libgda-3.1.2.orig/libgda/gda-command.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-command.h 2012-01-24 09:17:50.262978083 -0600
+@@ -25,8 +25,8 @@
+ #define __GDA_COMMAND_H__
+
+ #include <glib-object.h>
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-config.c libgda-3.1.2/libgda/gda-config.c
+--- libgda-3.1.2.orig/libgda/gda-config.c 2007-09-25 09:08:34.000000000 -0500
++++ libgda-3.1.2/libgda/gda-config.c 2012-01-24 09:17:49.155837372 -0600
+@@ -38,7 +38,7 @@
+ #include <sys/stat.h>
+ #ifdef HAVE_FAM
+ #include <fam.h>
+-#include <glib/giochannel.h>
++#include <glib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-config.h libgda-3.1.2/libgda/gda-config.h
+--- libgda-3.1.2.orig/libgda/gda-config.h 2007-09-25 09:08:42.000000000 -0500
++++ libgda-3.1.2/libgda/gda-config.h 2012-01-24 09:17:49.772915799 -0600
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_CONFIG_H__
+ #define __GDA_CONFIG_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-data-model.h>
+ #include <libgda/gda-parameter.h>
+
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-data-model-array.c libgda-3.1.2/libgda/gda-data-model-array.c
+--- libgda-3.1.2.orig/libgda/gda-data-model-array.c 2007-08-29 07:46:50.000000000 -0500
++++ libgda-3.1.2/libgda/gda-data-model-array.c 2012-01-24 09:17:50.436000074 -0600
+@@ -22,7 +22,7 @@
+ */
+
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-row.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-data-model-filter-sql.c libgda-3.1.2/libgda/gda-data-model-filter-sql.c
+--- libgda-3.1.2.orig/libgda/gda-data-model-filter-sql.c 2007-08-29 07:46:50.000000000 -0500
++++ libgda-3.1.2/libgda/gda-data-model-filter-sql.c 2012-01-24 09:17:50.166965882 -0600
+@@ -21,7 +21,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gdataset.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-data-model-hash.c libgda-3.1.2/libgda/gda-data-model-hash.c
+--- libgda-3.1.2.orig/libgda/gda-data-model-hash.c 2007-09-25 03:54:35.000000000 -0500
++++ libgda-3.1.2/libgda/gda-data-model-hash.c 2012-01-24 09:17:54.953574234 -0600
+@@ -23,7 +23,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/ghash.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-data-model-hash.h>
+ #include <libgda/gda-data-model-extra.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-init.c libgda-3.1.2/libgda/gda-init.c
+--- libgda-3.1.2.orig/libgda/gda-init.c 2007-08-27 04:48:21.000000000 -0500
++++ libgda-3.1.2/libgda/gda-init.c 2012-01-24 09:17:50.541013420 -0600
+@@ -17,7 +17,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <gmodule.h>
+ #include <libgda/libgda.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-log.c libgda-3.1.2/libgda/gda-log.c
+--- libgda-3.1.2.orig/libgda/gda-log.c 2007-08-27 04:50:10.000000000 -0500
++++ libgda-3.1.2/libgda/gda-log.c 2012-01-24 09:17:50.410996895 -0600
+@@ -24,10 +24,10 @@
+ #include <syslog.h>
+ #endif
+ #include <time.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gutils.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-log.h>
+
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-log.h libgda-3.1.2/libgda/gda-log.h
+--- libgda-3.1.2.orig/libgda/gda-log.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-log.h 2012-01-24 09:17:49.280853261 -0600
+@@ -20,8 +20,8 @@
+ #if !defined(__gda_log_h__)
+ # define __gda_log_h__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
++#include <glib.h>
+ #include <time.h>
+
+ G_BEGIN_DECLS
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-quark-list.c libgda-3.1.2/libgda/gda-quark-list.c
+--- libgda-3.1.2.orig/libgda/gda-quark-list.c 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-quark-list.c 2012-01-24 09:17:48.905805595 -0600
+@@ -22,10 +22,10 @@
+ */
+
+ #include <libgda/gda-quark-list.h>
+-#include <glib/ghash.h>
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
+
+ struct _GdaQuarkList {
+ GHashTable *hash_table;
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-quark-list.h libgda-3.1.2/libgda/gda-quark-list.h
+--- libgda-3.1.2.orig/libgda/gda-quark-list.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-quark-list.h 2012-01-24 09:17:54.266486910 -0600
+@@ -24,8 +24,8 @@
+ #ifndef __GDA_QUARK_LIST_H__
+ #define __GDA_QUARK_LIST_H__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glib-object.h>
+
+ G_BEGIN_DECLS
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-row.h libgda-3.1.2/libgda/gda-row.h
+--- libgda-3.1.2.orig/libgda/gda-row.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-row.h 2012-01-24 09:17:55.190604359 -0600
+@@ -27,7 +27,7 @@
+
+ #include <glib-object.h>
+ #include <libgda/gda-column.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-decl.h>
+
+ G_BEGIN_DECLS
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-server-operation.c libgda-3.1.2/libgda/gda-server-operation.c
+--- libgda-3.1.2.orig/libgda/gda-server-operation.c 2007-10-04 08:03:18.000000000 -0500
++++ libgda-3.1.2/libgda/gda-server-operation.c 2012-01-24 09:17:55.119595334 -0600
+@@ -21,7 +21,7 @@
+ */
+
+ #include <stdlib.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-marshal.h>
+ #include <libgda/gda-dict.h>
+ #include <libgda/gda-dict-type.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-server-provider.c libgda-3.1.2/libgda/gda-server-provider.c
+--- libgda-3.1.2.orig/libgda/gda-server-provider.c 2007-10-19 03:34:53.000000000 -0500
++++ libgda-3.1.2/libgda/gda-server-provider.c 2012-01-24 09:17:50.860053968 -0600
+@@ -22,7 +22,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <libgda/gda-server-provider-extra.h>
+ #include <libgda/gda-server-provider-private.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-util.c libgda-3.1.2/libgda/gda-util.c
+--- libgda-3.1.2.orig/libgda/gda-util.c 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-util.c 2012-01-24 09:17:50.308983931 -0600
+@@ -27,9 +27,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <string.h>
+-#include <glib/gfileutils.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glib/gprintf.h>
+ #include <libsql/sql_parser.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-util.h libgda-3.1.2/libgda/gda-util.h
+--- libgda-3.1.2.orig/libgda/gda-util.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-util.h 2012-01-24 09:17:50.044950375 -0600
+@@ -24,8 +24,8 @@
+ #ifndef __GDA_UTIL_H__
+ #define __GDA_UTIL_H__
+
+-#include <glib/ghash.h>
+-#include <glib/glist.h>
++#include <glib.h>
++#include <glib.h>
+ #include "gda-parameter.h"
+ #include "gda-row.h"
+ #include "gda-connection.h"
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-value.c libgda-3.1.2/libgda/gda-value.c
+--- libgda-3.1.2.orig/libgda/gda-value.c 2007-10-19 07:51:34.000000000 -0500
++++ libgda-3.1.2/libgda/gda-value.c 2012-01-24 09:17:55.657663720 -0600
+@@ -28,10 +28,10 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <time.h>
+-#include <glib/gdate.h>
+-#include <glib/gmessages.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-blob-op.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/gda-value.h libgda-3.1.2/libgda/gda-value.h
+--- libgda-3.1.2.orig/libgda/gda-value.h 2007-08-26 10:23:48.000000000 -0500
++++ libgda-3.1.2/libgda/gda-value.h 2012-01-24 09:17:51.057079009 -0600
+@@ -27,8 +27,8 @@
+ #define __GDA_VALUE_H__
+
+ #include <time.h>
+-#include <glib/glist.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <libxml/tree.h>
+ #include <libgda/gda-decl.h>
+diff -r -U3 libgda-3.1.2.orig/libgda/sqlite/gda-sqlite.h libgda-3.1.2/libgda/sqlite/gda-sqlite.h
+--- libgda-3.1.2.orig/libgda/sqlite/gda-sqlite.h 2007-09-14 14:32:18.000000000 -0500
++++ libgda-3.1.2/libgda/sqlite/gda-sqlite.h 2012-01-24 09:17:51.491134176 -0600
+@@ -25,8 +25,8 @@
+ #ifndef __GDA_SQLITE_H__
+ #define __GDA_SQLITE_H__
+
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
++#include <glib.h>
+ #include <libgda/gda-value.h>
+ #include <libgda/gda-connection.h>
+
+diff -r -U3 libgda-3.1.2.orig/providers/bdb/gda-bdb.h libgda-3.1.2/providers/bdb/gda-bdb.h
+--- libgda-3.1.2.orig/providers/bdb/gda-bdb.h 2007-08-26 10:23:33.000000000 -0500
++++ libgda-3.1.2/providers/bdb/gda-bdb.h 2012-01-24 09:17:44.534249991 -0600
+@@ -25,7 +25,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <db.h>
+diff -r -U3 libgda-3.1.2.orig/providers/freetds/gda-freetds.h libgda-3.1.2/providers/freetds/gda-freetds.h
+--- libgda-3.1.2.orig/providers/freetds/gda-freetds.h 2007-08-26 10:23:34.000000000 -0500
++++ libgda-3.1.2/providers/freetds/gda-freetds.h 2012-01-24 09:17:44.093193935 -0600
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+diff -r -U3 libgda-3.1.2.orig/providers/freetds/gda-freetds-message.h libgda-3.1.2/providers/freetds/gda-freetds-message.h
+--- libgda-3.1.2.orig/providers/freetds/gda-freetds-message.h 2007-08-26 10:23:34.000000000 -0500
++++ libgda-3.1.2/providers/freetds/gda-freetds-message.h 2012-01-24 09:17:44.138199657 -0600
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+diff -r -U3 libgda-3.1.2.orig/providers/freetds/gda-freetds-types.h libgda-3.1.2/providers/freetds/gda-freetds-types.h
+--- libgda-3.1.2.orig/providers/freetds/gda-freetds-types.h 2007-08-26 10:23:34.000000000 -0500
++++ libgda-3.1.2/providers/freetds/gda-freetds-types.h 2012-01-24 09:17:43.945175123 -0600
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
+diff -r -U3 libgda-3.1.2.orig/providers/ibmdb2/gda-ibmdb2.h libgda-3.1.2/providers/ibmdb2/gda-ibmdb2.h
+--- libgda-3.1.2.orig/providers/ibmdb2/gda-ibmdb2.h 2007-08-26 10:23:34.000000000 -0500
++++ libgda-3.1.2/providers/ibmdb2/gda-ibmdb2.h 2012-01-24 09:17:44.789282408 -0600
+@@ -23,7 +23,7 @@
+ #if !defined(__gda_ibmdb2_h__)
+ # define __gda_ibmdb2_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+diff -r -U3 libgda-3.1.2.orig/providers/ibmdb2/gda-ibmdb2-types.h libgda-3.1.2/providers/ibmdb2/gda-ibmdb2-types.h
+--- libgda-3.1.2.orig/providers/ibmdb2/gda-ibmdb2-types.h 2007-08-26 10:23:34.000000000 -0500
++++ libgda-3.1.2/providers/ibmdb2/gda-ibmdb2-types.h 2012-01-24 09:17:44.881294100 -0600
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_IBMDB2_TYPES_H__
+ #define __GDA_IBMDB2_TYPES_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <sqlcli1.h>
+diff -r -U3 libgda-3.1.2.orig/providers/ldap/gda-ldap.h libgda-3.1.2/providers/ldap/gda-ldap.h
+--- libgda-3.1.2.orig/providers/ldap/gda-ldap.h 2007-10-05 14:09:44.000000000 -0500
++++ libgda-3.1.2/providers/ldap/gda-ldap.h 2012-01-24 09:17:44.997308844 -0600
+@@ -26,7 +26,7 @@
+ #if !defined(__gda_ldap_h__)
+ # define __gda_ldap_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/providers/mdb/gda-mdb.h libgda-3.1.2/providers/mdb/gda-mdb.h
+--- libgda-3.1.2.orig/providers/mdb/gda-mdb.h 2007-10-11 08:06:27.000000000 -0500
++++ libgda-3.1.2/providers/mdb/gda-mdb.h 2012-01-24 09:17:45.730402015 -0600
+@@ -24,7 +24,7 @@
+ #ifndef __GDA_MDB_H__
+ #define __GDA_MDB_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/providers/msql/gda-msql.h libgda-3.1.2/providers/msql/gda-msql.h
+--- libgda-3.1.2.orig/providers/msql/gda-msql.h 2007-08-26 10:23:38.000000000 -0500
++++ libgda-3.1.2/providers/msql/gda-msql.h 2012-01-24 09:17:44.711272495 -0600
+@@ -22,7 +22,7 @@
+ #ifndef __gda_msql_h__
+ #define __gda_msql_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/providers/mysql/gda-mysql.h libgda-3.1.2/providers/mysql/gda-mysql.h
+--- libgda-3.1.2.orig/providers/mysql/gda-mysql.h 2007-08-26 10:23:38.000000000 -0500
++++ libgda-3.1.2/providers/mysql/gda-mysql.h 2012-01-24 09:17:45.471369095 -0600
+@@ -25,7 +25,7 @@
+ #ifndef __GDA_MYSQL_H__
+ #define __GDA_MYSQL_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/providers/odbc/gda-odbc.h libgda-3.1.2/providers/odbc/gda-odbc.h
+--- libgda-3.1.2.orig/providers/odbc/gda-odbc.h 2007-08-26 10:23:38.000000000 -0500
++++ libgda-3.1.2/providers/odbc/gda-odbc.h 2012-01-24 09:17:45.044314819 -0600
+@@ -25,7 +25,7 @@
+ #if !defined(__gda_odbc_h__)
+ # define __gda_odbc_h__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+diff -r -U3 libgda-3.1.2.orig/providers/oracle/gda-oracle.h libgda-3.1.2/providers/oracle/gda-oracle.h
+--- libgda-3.1.2.orig/providers/oracle/gda-oracle.h 2007-08-26 10:23:37.000000000 -0500
++++ libgda-3.1.2/providers/oracle/gda-oracle.h 2012-01-24 09:17:43.602131524 -0600
+@@ -31,7 +31,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
+diff -r -U3 libgda-3.1.2.orig/providers/postgres/gda-postgres.h libgda-3.1.2/providers/postgres/gda-postgres.h
+--- libgda-3.1.2.orig/providers/postgres/gda-postgres.h 2007-08-26 10:23:38.000000000 -0500
++++ libgda-3.1.2/providers/postgres/gda-postgres.h 2012-01-24 09:17:44.145200546 -0600
+@@ -24,7 +24,7 @@
+ #ifndef __GDA_POSTGRES_H__
+ #define __GDA_POSTGRES_H__
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include "gda-postgres-provider.h"
+diff -r -U3 libgda-3.1.2.orig/providers/sybase/gda-sybase.h libgda-3.1.2/providers/sybase/gda-sybase.h
+--- libgda-3.1.2.orig/providers/sybase/gda-sybase.h 2007-08-26 10:23:33.000000000 -0500
++++ libgda-3.1.2/providers/sybase/gda-sybase.h 2012-01-24 09:17:45.422362866 -0600
+@@ -32,7 +32,7 @@
+ # include <config.h>
+ #endif
+
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <ctpublic.h>
diff --git a/compat-libgda.spec b/compat-libgda.spec
index a916680..46322f6 100644
--- a/compat-libgda.spec
+++ b/compat-libgda.spec
@@ -37,7 +37,7 @@
Name: compat-libgda
Version: 3.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library for writing gnome database programs
Group: System Environment/Libraries
License: LGPLv2+
@@ -47,6 +47,7 @@ Patch1: libgda-3.0.0-man.patch
Patch2: libgda-3.1.2-new-freetds.patch
Patch3: libgda-3.1.2-lib64.patch
Patch4: libgda-3.1.2-bdbmakefile.patch
+Patch5: compat-libgda-3.1.2-glib2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 0.8
BuildRequires: glib2-devel >= 2.0.0
@@ -316,6 +317,7 @@ This package includes the pkgconfig file for the libgda XBASE provider.
%patch2 -p1
%patch3 -p1 -b .lib64
%patch4 -p0
+%patch5 -p1
# fix ppc64 postgres detection
sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
configure configure.in
@@ -559,6 +561,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 24 2012 Jon Ciesla <limburgher at gmail.com> - 3.1.2-7
+- Patch for glib includes changes.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list