diff --git a/libgda-3.1.2-lib64.patch b/libgda-3.1.2-lib64.patch new file mode 100644 index 0000000..56f7a25 --- /dev/null +++ b/libgda-3.1.2-lib64.patch @@ -0,0 +1,14 @@ +--- libgda-3.1.2/libgda/binreloc/gda-binreloc.c~ 2007-08-31 17:11:37.000000000 +0200 ++++ libgda-3.1.2/libgda/binreloc/gda-binreloc.c 2008-10-27 12:39:39.000000000 +0100 +@@ -67,7 +67,11 @@ + prefix_dir_name = "share" G_DIR_SEPARATOR_S "locale"; + break; + case GDA_LIB_DIR: ++#ifdef __x86_64__ ++ prefix_dir_name = "lib64"; ++#else + prefix_dir_name = "lib"; ++#endif + break; + case GDA_LIBEXEC_DIR: + prefix_dir_name = "libexec"; diff --git a/libgda.spec b/libgda.spec index 74b211d..330b037 100644 --- a/libgda.spec +++ b/libgda.spec @@ -38,7 +38,7 @@ Name: libgda Epoch: 1 Version: 3.1.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries License: LGPLv2+ @@ -46,6 +46,7 @@ URL: http://www.gnome-db.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/%{name}-%{version}.tar.bz2 Patch1: libgda-3.0.0-man.patch Patch2: libgda-3.1.2-new-freetds.patch +Patch3: libgda-3.1.2-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.0.0 @@ -313,6 +314,7 @@ This package includes the pkgconfig file for the libgda XBASE provider. %setup -q %patch1 -p1 -b .man %patch2 -p1 +%patch3 -p1 -b .lib64 # fix ppc64 postgres detection sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \ configure configure.in @@ -556,6 +558,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 27 2008 Denis Leroy - 1:3.1.2-6 +- Added patch to fix providers path on x86_64 (#468510) + * Thu Jul 10 2008 Tom "spot" Callaway 1:3.1.2-5 - Rebuild against new db4-4.7