commit libgda3 for openSUSE:Factory

Hello community, here is the log from the commit of package libgda3 for openSUSE:Factory checked in at 2012-01-05 19:13:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda3 (Old) and /work/SRC/openSUSE:Factory/.libgda3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgda3", Maintainer is "gnome-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libgda3/libgda3.changes 2011-09-23 02:08:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgda3.new/libgda3.changes 2012-01-05 19:13:30.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 27 17:14:37 UTC 2011 - dimstar@opensuse.org + +- Add libgda-glib.patch: Fix build with glib 2.31. + +------------------------------------------------------------------- New: ---- libgda-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgda3.spec ++++++ --- /var/tmp/diff_new_pack.9Bh7qU/_old 2012-01-05 19:13:31.000000000 +0100 +++ /var/tmp/diff_new_pack.9Bh7qU/_new 2012-01-05 19:13:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libgda3 (Version 3.1.5) +# spec file for package libgda3 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: libgda3 %define real_name libgda BuildRequires: db-devel @@ -39,11 +36,11 @@ BuildRequires: sgml-skel BuildRequires: sqlite3-devel BuildRequires: unixODBC-devel -License: GPLv2+ ; LGPLv2.1+ -Group: Productivity/Databases/Clients Version: 3.1.5 -Release: 9 +Release: 0 Summary: GNU Data Access (GDA) Library +License: GPL-2.0+ ; LGPL-2.1+ +Group: Productivity/Databases/Clients BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gnome-db.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/%{real_name}/3.1/%{real_name}-%{version}.tar.bz2 @@ -55,6 +52,8 @@ Patch3: libgda-fix-soname.patch # PATCH-FIX-UPSTREAM libgda-am111.patch coolo@novell.com -- remove duplicates file Patch4: libgda-fix-am111.patch +# PATCH-FIX-UPSTREAM libgda-glib.patch dimstar@opensuse.org -- Fix build with glib 2.31: only glib.h can be included. Not sent upstream as this branch is dead upstream. +Patch5: libgda-glib.patch %description GNU Data Access (GDA) is an attempt to provide uniform access to @@ -82,7 +81,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0 -License: GPLv2+ ; LGPLv2.1+ Summary: GNU Data Access (GDA) Library Group: Productivity/Databases/Clients Requires: %{name} >= %{version} @@ -113,7 +111,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-3 -License: GPLv2+ ; LGPLv2.1+ Summary: GNU Data Access (GDA) Library Group: System/Libraries Recommends: %{name}-lang @@ -146,7 +143,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-report-3_0-3 -License: GPLv2+ ; LGPLv2.1+ Summary: GNU Data Access (GDA) Library Group: System/Libraries @@ -176,7 +172,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-xslt-3_0-0 -License: GPLv2+ ; LGPLv2.1+ Summary: GNU Data Access (GDA) Library Group: System/Libraries @@ -206,7 +201,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-devel -License: GPLv2+ ; LGPLv2.1+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: libgda-3_0-3 = %{version} glib2-devel libxml2-devel libxslt-devel glibc-devel gnome-vfs2-devel sqlite3-devel @@ -238,7 +232,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-doc -License: GPLv2+ ; LGPLv2.1+ Summary: Additional Package Documentation Group: Development/Libraries/C and C++ Requires: %{real_name}-3_0 = %{version} @@ -272,7 +265,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-mysql -License: GPLv2+ ; LGPLv2.1+ Summary: MySQL Provider for GNU Data Access (GDA) Group: Productivity/Databases/Clients %if %suse_version < 1030 @@ -309,7 +301,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-odbc -License: GPLv2+ ; LGPLv2.1+ Summary: ODBC Provider for GNU Data Access (GDA) Group: Productivity/Databases/Clients %if %suse_version < 1030 @@ -346,7 +337,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-postgres -License: GPLv2+ ; LGPLv2.1+ Summary: PostgreSQL Provider for GNU Data Access (GDA) Group: Productivity/Databases/Clients %if %suse_version < 1030 @@ -383,7 +373,6 @@ Gerhard Dieringer (report, queries) %package -n libgda-3_0-sqlite -License: GPLv2+ ; LGPLv2.1+ Summary: Sqlite Provider for GNU Data Access (GDA) Group: Productivity/Databases/Clients %if %suse_version < 1030 @@ -426,6 +415,7 @@ %patch1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # both flags needed for libgda-3.1.1: ++++++ libgda-glib.patch ++++++ Index: libgda-3.1.5/libgda/gda-command.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-command.h +++ libgda-3.1.5/libgda/gda-command.h @@ -25,8 +25,8 @@ #define __GDA_COMMAND_H__ #include -#include -#include +#include +#include G_BEGIN_DECLS Index: libgda-3.1.5/libgda/gda-column.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-column.h +++ libgda-3.1.5/libgda/gda-column.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include G_BEGIN_DECLS Index: libgda-3.1.5/libgda/gda-value.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-value.h +++ libgda-3.1.5/libgda/gda-value.h @@ -27,8 +27,7 @@ #define __GDA_VALUE_H__ #include -#include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-config.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-config.h +++ libgda-3.1.5/libgda/gda-config.h @@ -23,7 +23,7 @@ #ifndef __GDA_CONFIG_H__ #define __GDA_CONFIG_H__ -#include +#include #include #include Index: libgda-3.1.5/libgda/gda-log.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-log.h +++ libgda-3.1.5/libgda/gda-log.h @@ -20,8 +20,7 @@ #if !defined(__gda_log_h__) # define __gda_log_h__ -#include -#include +#include #include G_BEGIN_DECLS Index: libgda-3.1.5/libgda/gda-quark-list.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-quark-list.h +++ libgda-3.1.5/libgda/gda-quark-list.h @@ -24,8 +24,7 @@ #ifndef __GDA_QUARK_LIST_H__ #define __GDA_QUARK_LIST_H__ -#include -#include +#include #include G_BEGIN_DECLS Index: libgda-3.1.5/libgda/gda-row.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-row.h +++ libgda-3.1.5/libgda/gda-row.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include G_BEGIN_DECLS Index: libgda-3.1.5/libgda/gda-util.h =================================================================== --- libgda-3.1.5.orig/libgda/gda-util.h +++ libgda-3.1.5/libgda/gda-util.h @@ -24,8 +24,7 @@ #ifndef __GDA_UTIL_H__ #define __GDA_UTIL_H__ -#include -#include +#include #include "gda-parameter.h" #include "gda-row.h" #include "gda-connection.h" Index: libgda-3.1.5/libgda/gda-column.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-column.c +++ libgda-3.1.5/libgda/gda-column.c @@ -23,8 +23,7 @@ * Boston, MA 02111-1307, USA. */ -#include -#include +#include #include #include #include "gda-marshal.h" Index: libgda-3.1.5/libgda/gda-command.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-command.c +++ libgda-3.1.5/libgda/gda-command.c @@ -21,9 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#include -#include -#include +#include #include GType Index: libgda-3.1.5/libgda/gda-config.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-config.c +++ libgda-3.1.5/libgda/gda-config.c @@ -38,7 +38,6 @@ #include #ifdef HAVE_FAM #include -#include #include #include #include Index: libgda-3.1.5/libgda/gda-data-model-array.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-data-model-array.c +++ libgda-3.1.5/libgda/gda-data-model-array.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-data-model-filter-sql.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-data-model-filter-sql.c +++ libgda-3.1.5/libgda/gda-data-model-filter-sql.c @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-data-model-hash.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-data-model-hash.c +++ libgda-3.1.5/libgda/gda-data-model-hash.c @@ -23,7 +23,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-data-model.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-data-model.c +++ libgda-3.1.5/libgda/gda-data-model.c @@ -24,7 +24,7 @@ */ #include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-init.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-init.c +++ libgda-3.1.5/libgda/gda-init.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-log.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-log.c +++ libgda-3.1.5/libgda/gda-log.c @@ -24,10 +24,6 @@ #include #endif #include -#include -#include -#include -#include #include #include Index: libgda-3.1.5/libgda/gda-quark-list.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-quark-list.c +++ libgda-3.1.5/libgda/gda-quark-list.c @@ -22,10 +22,7 @@ */ #include -#include -#include -#include -#include +#include struct _GdaQuarkList { GHashTable *hash_table; Index: libgda-3.1.5/libgda/gda-server-operation.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-server-operation.c +++ libgda-3.1.5/libgda/gda-server-operation.c @@ -21,7 +21,7 @@ */ #include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-server-provider.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-server-provider.c +++ libgda-3.1.5/libgda/gda-server-provider.c @@ -22,7 +22,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-util.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-util.c +++ libgda-3.1.5/libgda/gda-util.c @@ -27,10 +27,7 @@ #include #include #include -#include -#include -#include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/gda-value.c =================================================================== --- libgda-3.1.5.orig/libgda/gda-value.c +++ libgda-3.1.5/libgda/gda-value.c @@ -28,10 +28,7 @@ #include #include #include -#include -#include -#include -#include +#include #include #include #include Index: libgda-3.1.5/libgda/sqlite/gda-sqlite.h =================================================================== --- libgda-3.1.5.orig/libgda/sqlite/gda-sqlite.h +++ libgda-3.1.5/libgda/sqlite/gda-sqlite.h @@ -25,8 +25,7 @@ #ifndef __GDA_SQLITE_H__ #define __GDA_SQLITE_H__ -#include -#include +#include #include #include Index: libgda-3.1.5/providers/bdb/gda-bdb.h =================================================================== --- libgda-3.1.5.orig/providers/bdb/gda-bdb.h +++ libgda-3.1.5/providers/bdb/gda-bdb.h @@ -25,7 +25,7 @@ #if defined(HAVE_CONFIG_H) #endif -#include +#include #include #include #include Index: libgda-3.1.5/providers/firebird/gda-firebird-provider.c =================================================================== --- libgda-3.1.5.orig/providers/firebird/gda-firebird-provider.c +++ libgda-3.1.5/providers/firebird/gda-firebird-provider.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "gda-firebird-provider.h" #include "gda-firebird-recordset.h" Index: libgda-3.1.5/providers/firebird/gda-firebird-recordset.c =================================================================== --- libgda-3.1.5.orig/providers/firebird/gda-firebird-recordset.c +++ libgda-3.1.5/providers/firebird/gda-firebird-recordset.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include Index: libgda-3.1.5/providers/freetds/gda-freetds-message.h =================================================================== --- libgda-3.1.5.orig/providers/freetds/gda-freetds-message.h +++ libgda-3.1.5/providers/freetds/gda-freetds-message.h @@ -24,7 +24,7 @@ #if defined(HAVE_CONFIG_H) #endif -#include +#include #include #include #include Index: libgda-3.1.5/providers/freetds/gda-freetds-types.h =================================================================== --- libgda-3.1.5.orig/providers/freetds/gda-freetds-types.h +++ libgda-3.1.5/providers/freetds/gda-freetds-types.h @@ -24,7 +24,7 @@ #if defined(HAVE_CONFIG_H) #endif -#include +#include #include #include #include Index: libgda-3.1.5/providers/freetds/gda-freetds.h =================================================================== --- libgda-3.1.5.orig/providers/freetds/gda-freetds.h +++ libgda-3.1.5/providers/freetds/gda-freetds.h @@ -24,7 +24,7 @@ #if defined(HAVE_CONFIG_H) #endif -#include +#include #include #include #include Index: libgda-3.1.5/providers/postgres/gda-postgres.h =================================================================== --- libgda-3.1.5.orig/providers/postgres/gda-postgres.h +++ libgda-3.1.5/providers/postgres/gda-postgres.h @@ -24,7 +24,7 @@ #ifndef __GDA_POSTGRES_H__ #define __GDA_POSTGRES_H__ -#include +#include #include #include #include "gda-postgres-provider.h" Index: libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h =================================================================== --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2-types.h +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2-types.h @@ -23,7 +23,7 @@ #ifndef __GDA_IBMDB2_TYPES_H__ #define __GDA_IBMDB2_TYPES_H__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h =================================================================== --- libgda-3.1.5.orig/providers/ibmdb2/gda-ibmdb2.h +++ libgda-3.1.5/providers/ibmdb2/gda-ibmdb2.h @@ -23,12 +23,11 @@ #if !defined(__gda_ibmdb2_h__) # define __gda_ibmdb2_h__ -#include +#include #include #include #include #include -#include #include #include "gda-ibmdb2-provider.h" Index: libgda-3.1.5/providers/ldap/gda-ldap.h =================================================================== --- libgda-3.1.5.orig/providers/ldap/gda-ldap.h +++ libgda-3.1.5/providers/ldap/gda-ldap.h @@ -26,7 +26,7 @@ #if !defined(__gda_ldap_h__) # define __gda_ldap_h__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/mdb/gda-mdb-provider.c =================================================================== --- libgda-3.1.5.orig/providers/mdb/gda-mdb-provider.c +++ libgda-3.1.5/providers/mdb/gda-mdb-provider.c @@ -22,7 +22,7 @@ */ #include -#include +#include #include #include #include Index: libgda-3.1.5/providers/mdb/gda-mdb.h =================================================================== --- libgda-3.1.5.orig/providers/mdb/gda-mdb.h +++ libgda-3.1.5/providers/mdb/gda-mdb.h @@ -24,7 +24,7 @@ #ifndef __GDA_MDB_H__ #define __GDA_MDB_H__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/msql/gda-msql.h =================================================================== --- libgda-3.1.5.orig/providers/msql/gda-msql.h +++ libgda-3.1.5/providers/msql/gda-msql.h @@ -22,7 +22,7 @@ #ifndef __gda_msql_h__ #define __gda_msql_h__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/mysql/gda-mysql.h =================================================================== --- libgda-3.1.5.orig/providers/mysql/gda-mysql.h +++ libgda-3.1.5/providers/mysql/gda-mysql.h @@ -25,7 +25,7 @@ #ifndef __GDA_MYSQL_H__ #define __GDA_MYSQL_H__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/odbc/gda-odbc.h =================================================================== --- libgda-3.1.5.orig/providers/odbc/gda-odbc.h +++ libgda-3.1.5/providers/odbc/gda-odbc.h @@ -25,7 +25,7 @@ #if !defined(__gda_odbc_h__) # define __gda_odbc_h__ -#include +#include #include #include #include Index: libgda-3.1.5/providers/oracle/gda-oracle.h =================================================================== --- libgda-3.1.5.orig/providers/oracle/gda-oracle.h +++ libgda-3.1.5/providers/oracle/gda-oracle.h @@ -31,7 +31,7 @@ #if defined(HAVE_CONFIG_H) #endif -#include +#include #include #include #include Index: libgda-3.1.5/providers/sybase/gda-sybase.h =================================================================== --- libgda-3.1.5.orig/providers/sybase/gda-sybase.h +++ libgda-3.1.5/providers/sybase/gda-sybase.h @@ -32,7 +32,7 @@ # include #endif -#include +#include #include #include #include -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org