rpms/libtool
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix ltdl file open (#225116)

Browse Source 
- fix lt_unset usage (#227454)
- spec file cleanups for merge review
This commit is contained in:
Karsten Hopp 2007-02-08 15:40:29 +00:00
parent 5cd18349bc
commit f79ec8ce5e
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libtool-1.5.22-relativepath.patch
View File

@ -1,15 +1,15 @@
--- libtool-1.5.22/libltdl/ltdl.c.rh2 2006-11-06 15:40:04.000000000 +0100 --- libtool-1.5.22/libltdl/ltdl.c.relativepath 2007-02-08 09:20:54.000000000 -0500
+++ libtool-1.5.22/libltdl/ltdl.c 2006-11-06 15:40:26.000000000 +0100 +++ libtool-1.5.22/libltdl/ltdl.c 2007-02-08 09:46:41.000000000 -0500
@@ -3203,10 +3203,12 @@ @@ -3203,9 +3203,10 @@
} }
#endif #endif
} }
+#if 0 - if (!file)
if (!file) + if (!file)
{ {
file = fopen (filename, LT_READTEXT_MODE); - file = fopen (filename, LT_READTEXT_MODE);
+ if(strstr(filename,"/") || strcmp((filename + strlen(filename) - 3), ".la") != 0)
+ file = fopen (filename, LT_READTEXT_MODE);
} }
+#endif
/* If we didn't find the file by now, it really isn't there. Set /* If we didn't find the file by now, it really isn't there. Set
the status flag, and bail out. */

66
libtool.spec
View File

@ -1,20 +1,22 @@
%define upstream_version 1.5.22 %define upstream_version 1.5.22
Summary: The GNU Portable Library Tool Summary: The GNU Portable Library Tool
Name: libtool Name: libtool
Version: %{upstream_version} Version: %{upstream_version}
Release: 8 Release: 9
License: GPL License: GPL
Group: Development/Tools Group: Development/Tools
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz Source: http://ftp.gnu.org/gnu/libtool/libtool-%{upstream_version}.tar.gz
URL: http://www.gnu.org/software/libtool/ URL: http://www.gnu.org/software/libtool/
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch1: libtool-1.5.18-multilib.patch Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Patch1: libtool-1.5.18-multilib.patch
# Remove in libtool-1.5.23: # Remove in libtool-1.5.23:
Patch2: libtool-1.5.22-misc.patch Patch2: libtool-1.5.22-misc.patch
Patch3: libtool-1.5.22-anygcc.patch Patch3: libtool-1.5.22-anygcc.patch
# skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths (p.e. files from kernel-xen): # skip over lines in /etc/ld.so.conf.d/* which don't look like absolute paths (p.e. files from kernel-xen):
Patch4: libtool-1.5.22-ldconfigvars.patch Patch4: libtool-1.5.22-ldconfigvars.patch
@ -24,13 +26,12 @@ Patch5: libtool-1.5.22-configupdate-217166.patch
# don't read .la file in current working directory, root might get tricked # don't read .la file in current working directory, root might get tricked
# into running a prepared binary in that directory: # into running a prepared binary in that directory:
Patch6: libtool-1.5.22-relativepath.patch Patch6: libtool-1.5.22-relativepath.patch
PreReq: /sbin/install-info BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
BuildRequires: autoconf >= 2.59, automake >= 1.9.2, texinfo
# make sure we can configure all supported langs # make sure we can configure all supported langs
BuildRequires: gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java BuildRequires: gcc, gcc-c++, libstdc++-devel, gcc-gfortran, gcc-java
# /usr/bin/libtool includes paths within gcc's versioned directories # /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built # Libtool must be rebuilt whenever a new upstream gcc is built
Requires: autoconf >= 2.50, automake >= 1.4 Requires: autoconf >= 2.50, automake >= 1.4
%description %description
GNU Libtool is a set of shell scripts which automatically configure UNIX and GNU Libtool is a set of shell scripts which automatically configure UNIX and
@ -53,11 +54,11 @@ support for multi-architecture systems, such as the AMD64 Opteron and the Intel
%package ltdl %package ltdl
Summary: Runtime libraries for GNU Libtool Dynamic Module Loader Summary: Runtime libraries for GNU Libtool Dynamic Module Loader
Group: System Environment/Libraries Group: System Environment/Libraries
Provides: libtool-libs = %{version}-%{release} Provides: libtool-libs = %{version}-%{release}
Obsoletes: libtool-libs Obsoletes: libtool-libs
License: LGPL License: LGPL
%description ltdl %description ltdl
The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a The libtool-ltdl package contains the GNU Libtool Dynamic Module Loader, a
@ -71,10 +72,10 @@ rest of the GNU Autotools (including GNU Autoconf and GNU Automake).
%package ltdl-devel %package ltdl-devel
Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader Summary: Tools needed for development using the GNU Libtool Dynamic Module Loader
Group: Development/Libraries Group: Development/Libraries
Requires: libtool-ltdl = %{version}-%{release} Requires: libtool-ltdl = %{version}-%{release}
License: LGPL License: LGPL
%description ltdl-devel %description ltdl-devel
Static libraries and header files for development with ltdl. Static libraries and header files for development with ltdl.
@ -84,11 +85,11 @@ Static libraries and header files for development with ltdl.
%prep %prep
%setup -n libtool-%{upstream_version} -q %setup -n libtool-%{upstream_version} -q
%patch1 -p1 -b .multilib %patch1 -p1 -b .multilib
%patch2 -p1 %patch2 -p1 -b .misc
%patch3 -p1 -b .anygcc %patch3 -p1 -b .anygcc
%patch4 -p1 -b .rh1 %patch4 -p1 -b .ldconfigvars
%patch5 -p1 -b .rh2 %patch5 -p1 -b .automake110
%patch6 -p1 -b .automake110 %patch6 -p1 -b .relativepath
%build %build
@ -127,7 +128,7 @@ rm -rf %{buildroot}
%preun %preun
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
/sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/libtool.info.gz %{_infodir}/dir || :
fi fi
%postun ltdl -p /sbin/ldconfig %postun ltdl -p /sbin/ldconfig
@ -158,6 +159,11 @@ fi
%changelog %changelog
* Thu Feb 08 2007 Karsten Hopp <karsten@redhat.com> 1.5.22-9
- fix ltdl file open (#225116)
- fix lt_unset usage (#227454)
- spec file cleanups for merge review
* Mon Jan 22 2007 Karsten Hopp <karsten@redhat.com> 1.5.22-8 * Mon Jan 22 2007 Karsten Hopp <karsten@redhat.com> 1.5.22-8
- don't abort (un)install scriptlets when _excludedocs is set (#223708) - don't abort (un)install scriptlets when _excludedocs is set (#223708)