rpms/freetds/devel freetds-0.82-libtool.patch, NONE, 1.1 freetds.spec, 1.22, 1.23

[Dmitry Butskoy]

Author: buc

Update of /cvs/extras/rpms/freetds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21620

Modified Files:
	freetds.spec 
Added Files:
	freetds-0.82-libtool.patch 
Log Message:


freetds-0.82-libtool.patch:

--- NEW FILE freetds-0.82-libtool.patch ---
diff -Naur freetds-0.82.orig/m4/iconv.m4 freetds-0.82/m4/iconv.m4
--- freetds-0.82.orig/m4/iconv.m4	2006-03-27 19:05:42.000000000 -0500
+++ freetds-0.82/m4/iconv.m4	2009-02-20 17:07:53.000000000 -0500
@@ -9,32 +9,20 @@
 
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
 AC_DEFUN([AM_ICONV_LINK],
 [
   dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
   dnl those with the standalone portable GNU libiconv installed).
 
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  LIBICONV=
+  LTLIBICONV=
+  INCICONV=
 
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
   dnl via --without-libiconv-prefix, he wants to use it. The first
   dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
   am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
   AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
     am_cv_func_iconv="no, consider installing GNU libiconv"


Index: freetds.spec
===================================================================
RCS file: /cvs/extras/rpms/freetds/devel/freetds.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- freetds.spec	30 Jan 2009 14:43:36 -0000	1.22
+++ freetds.spec	24 Feb 2009 11:42:58 -0000	1.23
@@ -7,13 +7,15 @@
 Name: freetds
 Summary: Implementation of the TDS (Tabular DataStream) protocol
 Version: 0.82
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+ and GPLv2+
 URL: http://www.freetds.org/
 Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.gz
 Source1: freetds-tds_sysdep_public.h
 Patch0: freetds-0.82-shared-libtds.patch
+Patch1: freetds-0.82-libtool.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, libtool
  
@@ -49,12 +51,16 @@
 %prep 
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 #  correct perl path
 sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl
 
 chmod -x samples/*.sh
 
+# Remove bogus libtool-related macros
+rm -f m4/lib-*.m4
+
 #  needed after patch0 ...
 autoreconf -f -i
  
@@ -62,6 +68,7 @@
 %build 
 %configure \
 	--disable-dependency-tracking \
+	--disable-rpath \
 	%{!?_with_static: --disable-static} \
 	--with-tdsver="4.2" \
 	--with-unixodbc="%{_prefix}" \
@@ -69,10 +76,6 @@
 	--enable-sybase-compat \
 	--with-gnutls
 
-# avoid any rpath
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
  
@@ -128,6 +131,9 @@
  
 
 %changelog
+* Tue Feb 24 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-4
+- fix autoconf data for libtool2 (patch by Tom Lane <tgl at redhat.com>)
+
 * Fri Jan 30 2009 Karsten Hopp <karsten at redhat.com> 0.82-3
 - add s390x to 64 bit archs