- for .la symlinks generate libtool(symlink), not libtool(target) Provides

[packages/rpm.git] / rpm-libtool-deps.patch

diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch
index d0217ded4aaa27dea150ad25c49a15df1638336d..4dc62f4e7c64f29e57e65c144a33566aaf1ca66a 100644 (file)
--- a/rpm-libtool-deps.patch
+++ b/rpm-libtool-deps.patch
@@ -1,7 +1,6 @@
-diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
---- rpm-4.4.6.org/scripts/libtooldeps.sh       2005-11-12 22:20:42.000000000 +0100
-+++ rpm-4.4.6/scripts/libtooldeps.sh   2006-11-26 20:06:49.254008750 +0100
-@@ -5,6 +5,8 @@
+--- rpm-4.4.8.org/scripts/libtooldeps.sh       2005-11-12 22:20:42.000000000 +0100
++++ rpm-4.4.8/scripts/libtooldeps.sh   2006-11-26 20:06:49.254008750 +0100
+@@ -5,15 +5,17 @@
      exit 0
  }
  
@@ -10,25 +9,26 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
  case $1 in
  -P|--provides)
      shift
-@@ -13,7 +15,8 @@
+-    RPM_BUILD_ROOT="$1"
++    RPM_BUILD_ROOT="$1"
+     while read possible
      do
        case "$possible" in
        *.la)
 -          if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then
-+          possible="`readlink -f "$possible" 2> /dev/null || echo "$possible"`"
-+          if file "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then
++          if file -L "$possible" | grep -iq 'libtool library file' 2> /dev/null ; then
                possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
                echo "libtool($possible)"
            fi
-@@ -22,21 +25,25 @@
+@@ -22,21 +24,28 @@
      done
      ;;
  -R|--requires)
 -    while read possible ; do
 -      case "$possible" in
 -      *.la)
--          for dep in `grep ^dependency_libs= "$possible" 2> /dev/null | \
--                      sed -r -e "s,^dependency_libs='(.*)',\1,g"`
+-          for dep in `grep '^dependency_libs='"$possible" 2> /dev/null | \
+-                      sed -e "s,^dependency_libs='\(.*\)',\1,g"`
 -          do
 -              case "$dep" in
 -              /*.la)
@@ -38,8 +38,8 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
 +          while read possible ; do
 +              case "$possible" in
 +              *.la)
-+                  for dep in `grep ^dependency_libs= "$possible" 2> /dev/null | \
-+                              sed -r -e "s,^dependency_libs='(.*)',\1,g"`
++                  for dep in `grep '^dependency_libs=' "$possible" 2> /dev/null | \
++                              sed -e "s,^dependency_libs='\(.*\)',\1,g"`
 +                  do
 +                      case "$dep" in
 +                      /*.la)
@@ -56,7 +56,9 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
 -    done
 -    ;;
 +     ;;
++     *)
++            cat > /dev/null
++     ;;
 +     esac
  esac
  exit 0
-