- fix building on x32

- rel 19

diff --git a/libgda3.spec b/libgda3.spec
index 841ff86ebc0bcf0c6e66aa14c93d453abaebe408..260a212eb0ecd12c04409f54c19f9accd1ceb149 100644 (file)
--- a/libgda3.spec
+++ b/libgda3.spec
@@ -29,7 +29,7 @@ Summary:      GNU Data Access library
 Summary(pl.UTF-8):     Biblioteka GNU Data Access
 Name:          libgda3
 Version:       3.1.5
-Release:       18
+Release:       19
 License:       LGPL v2+/GPL v2+
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgda/3.1/libgda-%{version}.tar.bz2
@@ -39,6 +39,7 @@ Patch1:               %{name}-am.patch
 Patch2:                glib232.patch
 Patch3:                format-security.patch
 Patch4:                mdb-0.7.patch
+Patch5:                x32.patch
 URL:           http://www.gnome-db.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf >= 2.59
@@ -302,6 +303,7 @@ Pakiet dostarczający dane z xBase (dBase, Clippera, FoxPro) dla GDA.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if %{without gamin}
 %{__sed} -i -e 's#PKG_CHECK_MODULES(GAMIN.*)#have_fam=no#g' configure.in

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..d7759bb
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,16 @@
+--- libgda-3.1.5/configure.in.orig     2016-05-05 18:15:14.000000000 +0200
++++ libgda-3.1.5/configure.in  2016-05-05 18:20:11.722298716 +0200
+@@ -213,7 +213,12 @@
+ dnl Test for lib64 architectures
+ dnl FIXME: should really check target
+ case $host_cpu in
+-x86_64* | sparc64* | s390x* | ppc64* | powerpc64* ) lib="lib64";;
++sparc64* | s390x* | ppc64* | powerpc64* ) lib="lib64";;
++x86_64*) case $host_os in
++      *-gnux32) lib="libx32";;
++      *) lib="lib64";;
++      esac
++      ;;
+ *) lib="lib";;
+ esac
+