- remove /lib64 and /usr/lib64 rpathlibtool-2_2_6-10_fc11

3 files changed, 24 insertions, 26 deletions

diff --git a/libtool-1.5.24-multilib.patch b/libtool-1.5.24-multilib.patch
deleted file mode 100644
index decaadc..0000000
--- a/libtool-1.5.24-multilib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libtool-1.5.24_patched/libtool.m4.multilib	2007-07-10 14:39:32.000000000 +0200
-+++ libtool-1.5.24_patched/libtool.m4	2007-07-10 14:48:00.000000000 +0200
-@@ -559,6 +559,7 @@ s390*-*linux*|sparc*-*linux*)
-       esac
-       ;;
-     *64-bit*)
-+      libsuff=64
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -1617,11 +1618,13 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # 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;/^$/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/libtool-2.2.6a-rpath.patch b/libtool-2.2.6a-rpath.patch
new file mode 100644
index 0000000..defa6b2
--- /dev/null
+++ b/libtool-2.2.6a-rpath.patch
@@ -0,0 +1,18 @@
+diff -up libtool-2.2.6/libltdl/m4/libtool.m4.rpath libtool-2.2.6/libltdl/m4/libtool.m4
+--- libtool-2.2.6/libltdl/m4/libtool.m4.rpath	2008-09-05 07:54:41.000000000 -0400
++++ libtool-2.2.6/libltdl/m4/libtool.m4	2009-02-18 06:56:47.000000000 -0500
+@@ -2470,10 +2470,13 @@ linux* | k*bsd*-gnu)
+   # 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;/^$/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/libtool.spec b/libtool.spec
index d6f5298..e1bad2d 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -3,10 +3,11 @@
 Summary: The GNU Portable Library Tool
 Name:    libtool
 Version: 2.2.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+ and GFDL
 Group:   Development/Tools
 Source:  http://ftp.gnu.org/gnu/libtool/libtool-%{version}a.tar.gz
+Patch0:  libtool-2.2.6a-rpath.patch
 URL:     http://www.gnu.org/software/libtool/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 Requires(post):  /sbin/install-info
@@ -67,6 +68,7 @@ Static libraries and header files for development with ltdl.
 
 %prep
 %setup -n libtool-%{version} -q
+%patch0 -p1 -b .rpath
 
 %build
 
@@ -140,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Feb 18 2009 Karsten Hopp <karsten@redhat.com> 2.2.6-10
+- remove /lib64 and /usr/lib64 rpath
+
 * Fri Feb  6 2009 Jakub Jelinek <jakub@redhat.com> 2.2.6-9
 - rebuilt again for gcc-4.4.0