- added libdirs patch - try to sanitize sys_lib_search_path_spec, to avoid

  using ugly paths containing '../' and '//'
- release 2

Changed files:
    libtool-libdirs.patch -> 1.1
    libtool.spec -> 1.81

diff --git a/libtool-libdirs.patch b/libtool-libdirs.patch
new file mode 100644 (file)
index 0000000..ea828ad
--- /dev/null
+++ b/libtool-libdirs.patch
@@ -0,0 +1,24 @@
+--- libtool-1.5/libtool.m4.orig        2003-04-14 23:58:23.000000000 +0200
++++ libtool-1.5/libtool.m4     2003-04-20 12:22:06.000000000 +0200
+@@ -1103,6 +1103,21 @@
+   else
+     sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++  # sanitize
++  new_sys_lib_search_path_spec=
++  for d in $sys_lib_search_path_spec ; do
++    # check if exists
++    if test -d $d -a -x $d ; then
++      # normalize
++      new_d=$(cd $d ; pwd)
++      # uniq
++      if ! echo "$new_sys_lib_search_path_spec" | grep -q -F -e " $new_d " ; then
++        new_sys_lib_search_path_spec="$new_sys_lib_search_path_spec $new_d "
++      fi
++    fi
++  done
++  # compress spaces
++  sys_lib_search_path_spec=`echo "$new_sys_lib_search_path_spec" | $SED -e 's/^ *//g;s/ \+/ /g;s/ $//g'`
+ else
+   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi

diff --git a/libtool.spec b/libtool.spec
index 7546bc0fa4150ba2fe9aa643e81978d54c703ca4..4496fcd112b3bd067c24e2cadfe8ae33c6cc4dbc 100644 (file)
--- a/libtool.spec
+++ b/libtool.spec
@@ -6,7 +6,7 @@ Summary(ru):    GNU libtool, 
 Summary(uk):   GNU libtool, ÎÁÂ¦Ò ÕÔÉÌ¦Ô ÄÌÑ ÇÅÎÅÒÁæ§ ÄÉÎÁͦÞÎÉÈ Â¦Â̦ÏÔÅË
 Name:          libtool
 Version:       1.5
-Release:       1
+Release:       2
 Epoch:         2
 License:       GPL
 Group:         Development/Tools
@@ -16,12 +16,16 @@ Patch0:             %{name}-info.patch
 Patch1:                %{name}-mktemp.patch
 Patch2:                %{name}-relink.patch
 Patch3:                %{name}-pmake.patch
+Patch4:                %{name}-libdirs.patch
 URL:           http://www.gnu.org/software/libtool/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1.7.3
 %requires_eq   gcc
 Requires:      %(which %{__cc})
+Requires:      coreutils
+Requires:      grep
 Requires:      mktemp
+Requires:      sed
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -127,6 +131,7 @@ utilizando componentes est
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal}