rpms/libtool/FC-4 libtool-1.5.14-multilib.patch, 1.2, 1.3 .cvsignore, 1.13, 1.14 libtool.spec, 1.28, 1.29 sources, 1.13, 1.14 libtool-1.5.12.multilib2.patch, 1.1, NONE libtool-1.5.18-multilib.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/libtool/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29886/FC-4

Modified Files:
	.cvsignore libtool.spec sources 
Added Files:
	libtool-1.5.14-multilib.patch 
Removed Files:
	libtool-1.5.12.multilib2.patch libtool-1.5.18-multilib.patch 
Log Message:
auto-import libtool-1.5.16.multilib2-2 on branch FC-4 from libtool-1.5.16.multilib2-2.src.rpm

libtool-1.5.14-multilib.patch:
 libtool.m4 |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletion(-)

Index: libtool-1.5.14-multilib.patch
===================================================================
RCS file: libtool-1.5.14-multilib.patch
diff -N libtool-1.5.14-multilib.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libtool-1.5.14-multilib.patch	21 Jul 2005 13:19:38 -0000	1.3
@@ -0,0 +1,31 @@
+--- libtool-1.5.14/libtool.m4.multilib	2005-02-12 12:18:34.000000000 +0000
++++ libtool-1.5.14/libtool.m4	2005-02-15 08:48:42.189498479 +0000
+@@ -1456,10 +1456,27 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # find out which ABI we are using
++  libsuff=
++  case "$host_cpu" in
++  x86_64*|s390x*|powerpc64*)
++    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++    if AC_TRY_EVAL(ac_compile); then
++      case `/usr/bin/file conftest.$ac_objext` in
++      *64-bit*)
++        libsuff=64
++        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
++        ;;
++      esac
++    fi
++    rm -rf conftest*
++    ;;
++  esac
++
+   # 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)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libtool/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 May 2005 03:53:48 -0000	1.13
+++ .cvsignore	21 Jul 2005 13:19:38 -0000	1.14
@@ -1 +1 @@
-libtool-1.5.18.tar.gz
+libtool-1.5.16.tar.gz


Index: libtool.spec
===================================================================
RCS file: /cvs/dist/rpms/libtool/FC-4/libtool.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libtool.spec	17 May 2005 04:16:21 -0000	1.28
+++ libtool.spec	21 Jul 2005 13:19:38 -0000	1.29
@@ -1,16 +1,19 @@
-%define upstream_version 1.5.18
+%define upstream_version 1.5.16
 %define gcc_version %(gcc -dumpversion)
 
+# N.B. on next upstream release beyond 1.5.14 please remove the weird
+# Version suffix.
+
 Summary:	The GNU Portable Library Tool
 Name:		libtool
-Version:	%{upstream_version}
+Version:	%{upstream_version}.multilib2
 Release: 2
 License:	GPL
 Group:		Development/Tools
 Source:		http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
 URL:		http://www.gnu.org/software/libtool/
 BuildRoot:	%{_tmppath}/%{name}-root
-Patch1:		libtool-1.5.18-multilib.patch
+Patch1:		libtool-1.5.14-multilib.patch
 PreReq:		/sbin/install-info
 BuildRequires:	autoconf >= 2.59, automake >= 1.9.2, texinfo
 # make sure we can configure all supported langs
@@ -136,11 +139,8 @@
 
 
 %changelog
-* Tue May 17 2005 Alexandre Oliva <aoliva at redhat.com> 1.5.18-2
-- Update patch file.
-
-* Tue May 17 2005 Alexandre Oliva <aoliva at redhat.com> 1.5.18-1
-- 1.5.18.  Removed .multilib2 suffix.
+* Thu Jul 21 2005 Jakub Jelinek <jakub at redhat.com> 1.5.16.multilib2-2
+- rebuilt with GCC 4.0.1.
 
 * Tue Apr 26 2005 Alexandre Oliva <aoliva at redhat.com> 1.5.16.multilib2-1
 - 1.5.16 fixes #132435.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libtool/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 May 2005 03:53:48 -0000	1.13
+++ sources	21 Jul 2005 13:19:38 -0000	1.14
@@ -1 +1 @@
-3c6630a02bf0858c365ee32e0599255e  libtool-1.5.18.tar.gz
+5f3c344ae62a1d1fd789877e8080ae57  libtool-1.5.16.tar.gz


--- libtool-1.5.12.multilib2.patch DELETED ---


--- libtool-1.5.18-multilib.patch DELETED ---