[mingw-libltdl: 26/42] - Updated to native package libtool-2.2.10-2 (#601138). - FWIW, (re-?)added the libtool-2.2.10-rpath

[epienbro]

commit 0c0f71d58049bd5d3c1311776e8c889adf32fa02
Author: Hans Ulrich Niedermann <ndim at fedoraproject.org>
Date:   Fri Jul 16 14:19:22 2010 +0000

    - Updated to native package libtool-2.2.10-2 (#601138).
    - FWIW, (re-?)added the libtool-2.2.10-rpath.patch to libtool.

 .cvsignore                 |    2 +-
 libtool-2.2.10-rpath.patch |   19 +++++++++++++++++++
 mingw32-libltdl.spec       |   14 +++++++++++---
 sources                    |    2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index 23b8a9a..b37d0b6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libtool-2.2.6b.tar.lzma
+libtool-2.2.10.tar.lzma
diff --git a/libtool-2.2.10-rpath.patch b/libtool-2.2.10-rpath.patch
new file mode 100644
index 0000000..d0d6d82
--- /dev/null
+++ b/libtool-2.2.10-rpath.patch
@@ -0,0 +1,19 @@
+diff -urN libtool-2.2.10/libltdl/m4/libtool.m4 libtool-2.2.10_new/libltdl/m4/libtool.m4
+--- libtool-2.2.10/libltdl/m4/libtool.m4	2010-05-20 23:22:02.000000000 +0200
++++ libtool-2.2.10_new/libltdl/m4/libtool.m4	2010-06-24 11:18:06.000000000 +0200
+@@ -2474,10 +2474,14 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Add ABI-specific directories to the system library path.
++  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
++
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
diff --git a/mingw32-libltdl.spec b/mingw32-libltdl.spec
index 7e9bc00..f030038 100644
--- a/mingw32-libltdl.spec
+++ b/mingw32-libltdl.spec
@@ -16,12 +16,13 @@
 %global   libltdl_major  7
 
 # Tarball patchlevel (a, b, etc. or nothing at all)
-%global   patchlevel  b
+#global   patchlevel  b
+%global   patchlevel  %{nil}
 
 Summary:  Runtime libraries for GNU Libtool Dynamic Module Loader
 Name:     mingw32-libltdl
-Version:  2.2.6
-Release:  17.4%{?dist}
+Version:  2.2.10
+Release:  2.1%{?dist}
 Group:    System Environment/Libraries
 # Even though the source package contains files under
 # "GPLv2+ and LGPLv2+ and GFDL", the binary RPM only ships LGPLv2+ code.
@@ -32,6 +33,8 @@ Source:   http://ftp.gnu.org/gnu/libtool/libtool-%{version}%{?patchlevel}.tar.lz
 URL:      http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
+Patch0:   libtool-2.2.10-rpath.patch
+
 BuildRequires:  mingw32-filesystem >= 53
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gcc
@@ -62,6 +65,7 @@ the rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
 
 %prep
 %setup -n libtool-%{version}%{?patchlevel} -q
+%patch0 -p1 -b .rpath
 
 
 %build
@@ -112,6 +116,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 16 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 2.2.10-2.1
+- Updated to native package libtool-2.2.10-2 (#601138).
+- FWIW, (re-?)added the libtool-2.2.10-rpath.patch to libtool.
+
 * Thu Feb 11 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 2.2.6-17.4
 - Fix debuginfo magic. It needs define macros, not global ones.
 
diff --git a/sources b/sources
index 2d32d92..046002d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4b36980765003b47dd75ac9429f4f11  libtool-2.2.6b.tar.lzma
+2eba13ecd07653d0e34d4efe8e2974d8  libtool-2.2.10.tar.lzma