[libgda] upstream 4.2.11

[Haïkel Guémar]

commit b866cb9b498228163ffddef9600f8dc312e96cf4
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sat Nov 26 11:48:31 2011 +0100

    upstream 4.2.11

 .gitignore                      |    1 +
 libgda-4.2.0-fix.patch          |   39 ---------------------------------------
 libgda-4.2.11-dso-linking.patch |   13 +++++++++++++
 libgda.spec                     |   39 ++++++++++++++++++++++-----------------
 sources                         |    2 +-
 5 files changed, 37 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95eae92..f139715 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ libgda-4.1.6.tar.bz2
 /libgda-4.2.4.tar.bz2
 /libgda-4.2.5.tar.bz2
 /libgda-4.2.8.tar.bz2
+/libgda-4.2.11.tar.bz2
diff --git a/libgda-4.2.11-dso-linking.patch b/libgda-4.2.11-dso-linking.patch
new file mode 100644
index 0000000..4998353
--- /dev/null
+++ b/libgda-4.2.11-dso-linking.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/browser/canvas/Makefile.in b/tools/browser/canvas/Makefile.in
+index 7b82a85..665cfe8 100644
+--- a/tools/browser/canvas/Makefile.in
++++ b/tools/browser/canvas/Makefile.in
+@@ -215,7 +215,7 @@ JSON_GLIB_LIBS = @JSON_GLIB_LIBS@
+ LD = @LD@
+ LDAP_CFLAGS = @LDAP_CFLAGS@
+ LDAP_LIBS = @LDAP_LIBS@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm
+ LIBCRYPTO_CFLAGS = @LIBCRYPTO_CFLAGS@
+ LIBCRYPTO_LIBS = @LIBCRYPTO_LIBS@
+ LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
diff --git a/libgda.spec b/libgda.spec
index 07a3dc4..b9e48fc 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -19,37 +19,36 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.2.8
+Version:          4.2.11
 Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
 URL:              http://www.gnome-db.org/
-Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.0/%{name}-%{version}.tar.bz2
+Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.2/%{name}-%{version}.tar.bz2
 Patch1:           libgda-3.0.0-man.patch
 Patch2:           libgda-3.99.8-lib64.patch
 Patch3:           libgda-4.2.4-sqlite3.patch
+Patch4:           libgda-4.2.11-dso-linking.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.16
-BuildRequires:	  gtk2-devel >= 2.20.0
-BuildRequires:	  unique-devel >= 1.1.6
-BuildRequires:	  gtksourceview2-devel >= 2.10.0
-BuildRequires:	  goocanvas-devel >= 0.15
-BuildRequires: 	  graphviz-devel >= 2.26.0
-BuildRequires:	  iso-codes >= 3.15
+BuildRequires:    gtk2-devel >= 2.20.0
+BuildRequires:    unique-devel >= 1.1.6
+BuildRequires:    gtksourceview2-devel >= 2.10.0
+BuildRequires:    goocanvas-devel >= 0.15
+BuildRequires:    graphviz-devel >= 2.26.0
+BuildRequires:    iso-codes >= 3.15
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    sqlite-devel >= 3.6.0
-BuildRequires:    gamin-devel >= 0.1.8
 BuildRequires:    libtool
 BuildRequires:    gobject-introspection-devel >= 0.6.5
 BuildRequires:    libxml2-devel readline-devel db4-devel json-glib-devel
 BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Parser)
-BuildRequires:    gnome-vfs2-devel >= 2.20
 BuildRequires:    libsoup-devel
-BuildRequires:	  java-1.6.0-openjdk >= 1.6.0.0
+BuildRequires:    java-1.6.0-openjdk >= 1.6.0.0
 BuildRequires:    gnome-doc-utils
-BuildRequires:	  db4-devel
+BuildRequires:    db4-devel
 BuildRequires:    openldap-devel
 # note we do not provide these, they no longer exist
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
@@ -111,16 +110,16 @@ Summary:          Development libraries and header files for libgda-ui
 Group:            Development/Libraries
 Requires:         %{name}-ui = %{epoch}:%{version}-%{release}
 Requires:         %{name}-devel = %{epoch}:%{version}-%{release}
-Requires:	  gtk2-devel >= 2.20.0
+Requires:         gtk2-devel >= 2.20.0
 
 %description ui-devel
 This package contains the header files and libraries needed to write
 or compile programs that use libgda-ui.
 
 %package tools
-Summary:	  Graphical tools for libgda
-Group:		  Applications/Databases
-Requires:	  %{name}-ui = %{epoch}:%{version}-%{release}
+Summary:          Graphical tools for libgda
+Group:            Applications/Databases
+Requires:         %{name}-ui = %{epoch}:%{version}-%{release}
 
 %description tools
 This package provides libgda graphical tools.
@@ -268,6 +267,7 @@ This package includes the pkgconfig file for the libgda Java JDBC provider.
 %patch1 -p1 -b .man
 %patch2 -p1 -b .lib64
 %patch3 -p1 -b .sqlite3
+%patch4 -p1 -b .dso
 # need to reconfigure autotools scripts against newer toolchain
 #autoreconf -fi
 
@@ -346,7 +346,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gda-list-*-4.0
 %{_bindir}/gda-sql-4.0
 %{_bindir}/gda-test-connection-4.0
-%{_bindir}/gda_trml2*
+#%{_bindir}/gda_trml2*
 %{_bindir}/gda-list-config
 %{_bindir}/gda-list-server-op
 %{_bindir}/gda-sql
@@ -503,6 +503,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 26 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.11-1
+- upstream 4.1.11
+- sqlite provider can load sqlite extensions using "SELECT load_extension ('xxx')"
+- remove unused BR
+
 * Thu Aug 25 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.8-1
 - upstream 4.2.8
 - ldap read-only support is back
diff --git a/sources b/sources
index b7d2e7f..d35ff10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-320e6d237776ce4fab79e7c2210521da  libgda-4.2.8.tar.bz2
+e3c30af684e656f280e83a8394782120  libgda-4.2.11.tar.bz2