From 689a325e6062004e1fabf7587a44d6f86ad74343 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jun 17 2008 19:30:28 +0000 Subject: - Rebuild against new freetds --- diff --git a/libgda-3.1.2-new-freetds.patch b/libgda-3.1.2-new-freetds.patch new file mode 100644 index 0000000..d1c94a0 --- /dev/null +++ b/libgda-3.1.2-new-freetds.patch @@ -0,0 +1,12 @@ +diff -up libgda-3.1.2/providers/freetds/gda-freetds-recordset.c~ libgda-3.1.2/providers/freetds/gda-freetds-recordset.c +--- libgda-3.1.2/providers/freetds/gda-freetds-recordset.c~ 2008-06-16 23:48:25.000000000 +0200 ++++ libgda-3.1.2/providers/freetds/gda-freetds-recordset.c 2008-06-16 23:48:25.000000000 +0200 +@@ -208,7 +208,7 @@ gda_freetds_get_current_row(GdaFreeTDSRe + + field = gda_row_get_value (row, i); + col = recset->priv->res->columns[i]; +- val = &(recset->priv->res->current_row[col->column_offset]); ++ val = col->column_data; + + gda_freetds_set_gdavalue (field, val, col, + recset->priv->tds_cnc); diff --git a/libgda.spec b/libgda.spec index 2fe932e..4069984 100644 --- a/libgda.spec +++ b/libgda.spec @@ -38,13 +38,14 @@ Name: libgda Epoch: 1 Version: 3.1.2 -Release: 3%{?dist} +Release: 4%{?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}/3.1/%{name}-%{version}.tar.bz2 Patch1: libgda-3.0.0-man.patch +Patch2: libgda-3.1.2-new-freetds.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.0.0 @@ -57,7 +58,7 @@ Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release} Obsoletes: %{name}-sharp-devel < %{epoch}:%{version}-%{release} %if %{FREETDS} -BuildRequires: freetds-devel +BuildRequires: freetds-devel >= 0.82-2 %endif %if %{MYSQL} @@ -311,6 +312,7 @@ This package includes the pkgconfig file for the libgda XBASE provider. %prep %setup -q %patch1 -p1 -b .man +%patch2 -p1 # fix ppc64 postgres detection sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \ configure configure.in @@ -554,6 +556,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 17 2008 Hans de Goede 1:3.1.2-4 +- Rebuild against new freetds + * Tue Feb 19 2008 Fedora Release Engineering - 1:3.1.2-3 - Autorebuild for GCC 4.3