[libgda/f16] Fixes to build with OpenJDK 6 by Deepak Bhole

[Andrew Overholt]

commit 31d42b8903cf73302a184a53f30a9ce37d3956b1
Author: Andrew Overholt <overholt at redhat.com>
Date:   Fri Oct 28 15:54:14 2011 -0400

    Fixes to build with OpenJDK 6 by Deepak Bhole
    
    - Rebuild with java-1.6.0
    - Re-added patch to provide -lm (got removed by previous revert)
    - Added a patch to work around a gtk-doc bug (gnome bug#662865)

 libgda-4.2.0-fix.patch           |   39 --------------------------------------
 libgda-4.2.8-gtk-doc-error.patch |   17 ++++++++++++++++
 libgda-4.2.8-lm.patch            |   25 ++++++++++++++++++++++++
 libgda.spec                      |   15 +++++++++++--
 4 files changed, 54 insertions(+), 42 deletions(-)
---
diff --git a/libgda-4.2.8-gtk-doc-error.patch b/libgda-4.2.8-gtk-doc-error.patch
new file mode 100644
index 0000000..3483e60
--- /dev/null
+++ b/libgda-4.2.8-gtk-doc-error.patch
@@ -0,0 +1,17 @@
+diff -up ./libgda/sql-parser/gda-statement-struct-util.c.sav ./libgda/sql-parser/gda-statement-struct-util.c
+--- ./libgda/sql-parser/gda-statement-struct-util.c.sav	2011-10-27 10:51:29.051840285 -0400
++++ ./libgda/sql-parser/gda-statement-struct-util.c	2011-10-27 11:16:22.701241642 -0400
+@@ -353,11 +353,8 @@ gda_sql_identifier_needs_quotes (const g
+  * - otherwise convert to lower case
+  *
+  * The quoted string:
+- * <itemizedlist>
+- *   <listitem><para>must start and finish with the same single or double quotes character</para></listitem>
+- *   <listitem><para>can contain the delimiter character (the single or double quotes) in the string if every instance
+- *     of it is preceeded with a backslash character or with the delimiter character itself</para></listitem>
+- * </itemizedlist>
++ *   <para>- must start and finish with the same single or double quotes character</para>
++ *   <para>- can contain the delimiter character (the single or double quotes) in the string if every instance of it is preceeded with a backslash character or with the delimiter character itself</para>
+  *
+  * WARNING: @str must NOT be a composed identifier (&lt;part1&gt;."&lt;part2&gt;" for example)
+  * 
diff --git a/libgda-4.2.8-lm.patch b/libgda-4.2.8-lm.patch
new file mode 100644
index 0000000..c9c529d
--- /dev/null
+++ b/libgda-4.2.8-lm.patch
@@ -0,0 +1,25 @@
+diff -up ./configure.ac.sav ./configure.ac
+--- ./configure.ac.sav	2011-09-02 15:53:01.000000000 -0400
++++ ./configure.ac	2011-10-19 14:23:24.164923015 -0400
+@@ -145,6 +145,13 @@ dnl Check for pkg-config version; want >
+ dnl ******************************
+ PKG_PROG_PKG_CONFIG([0.18])
+ 
++
++dnl ******************************
++dnl Add math goo
++dnl ******************************
++AC_CHECK_LIBM
++AC_SUBST(LIBM)
++
+ dnl ******************************
+ dnl Checks for required libraries
+ dnl ******************************
+@@ -159,6 +166,7 @@ PKG_CHECK_MODULES(LIBGDA, [
+ TST_CFLAGS="$LIBGDA_CFLAGS"
+ LIBGDA_CFLAGS="$LIBGDA_CFLAGS -DLIBGDA_ABI_NAME=$LIBGDA_ABI_NAME"
+ 
++LIBGDA_LIBS="$LIBGDA_LIBS $LIBM"
+ 
+ dnl ******************************
+ dnl Checks for UI extension
diff --git a/libgda.spec b/libgda.spec
index 07a3dc4..5f26116 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -20,7 +20,7 @@
 Name:             libgda
 Epoch:            1
 Version:          4.2.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
 License:          LGPLv2+
@@ -29,6 +29,8 @@ Source:           http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.0/%{name}-%{v
 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.8-lm.patch
+Patch5:           libgda-%{version}-gtk-doc-error.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    pkgconfig >= 0.8
 BuildRequires:    glib2-devel >= 2.16
@@ -41,7 +43,7 @@ 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:    libtool automake autoconf
 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)
@@ -268,8 +270,10 @@ 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 .lm
+%patch5 -p1 -b .gtk-doc
 # need to reconfigure autotools scripts against newer toolchain
-#autoreconf -fi
+autoreconf -fi
 
 
 %build
@@ -503,6 +507,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 27 2011 Deepak Bhole <dbhole at redhat.com> - 1:4.2.8-2
+- Rebuild with java-1.6.0
+- Re-added patch to provide -lm (got removed by previous revert)
+- Added a patch to work around a gtk-doc bug (gnome bug#662865)
+
 * 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