rpms/libtool/devel libtool-2.2.6a-rpath.patch, NONE, 1.1 libtool.spec, 1.73, 1.74 libtool-1.5.24-multilib.patch, 1.1, NONE

[Karsten Hopp]

Author: karsten

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

Modified Files:
	libtool.spec 
Added Files:
	libtool-2.2.6a-rpath.patch 
Removed Files:
	libtool-1.5.24-multilib.patch 
Log Message:
- remove /lib64 and /usr/lib64 rpath

libtool-2.2.6a-rpath.patch:

--- NEW FILE libtool-2.2.6a-rpath.patch ---
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


Index: libtool.spec
===================================================================
RCS file: /cvs/extras/rpms/libtool/devel/libtool.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- libtool.spec	6 Feb 2009 12:14:12 -0000	1.73
+++ libtool.spec	18 Feb 2009 12:20:18 -0000	1.74
@@ -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 @@
 
 %prep
 %setup -n libtool-%{version} -q
+%patch0 -p1 -b .rpath
 
 %build
 
@@ -140,6 +142,9 @@
 
 
 %changelog
+* Wed Feb 18 2009 Karsten Hopp <karsten at redhat.com> 2.2.6-10
+- remove /lib64 and /usr/lib64 rpath
+
 * Fri Feb  6 2009 Jakub Jelinek <jakub at redhat.com> 2.2.6-9
 - rebuilt again for gcc-4.4.0
 


--- libtool-1.5.24-multilib.patch DELETED ---