- adjusted for updated pl.po patch

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

diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch
index d0217ded4aaa27dea150ad25c49a15df1638336d..00dd7d0dd3b9397af2207a0c44d8ec44ea3848ca 100644 (file)
--- a/rpm-libtool-deps.patch
+++ b/rpm-libtool-deps.patch
@@ -1,6 +1,5 @@
-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
+--- 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,6 +5,8 @@
      exit 0
  }
@@ -20,15 +19,15 @@ diff -urN rpm-4.4.6.org/scripts/libtooldeps.sh rpm-4.4.6/scripts/libtooldeps.sh
                possible="`echo ${possible} | sed -e s,${RPM_BUILD_ROOT}/,/,`"
                echo "libtool($possible)"
            fi
-@@ -22,21 +25,25 @@
+@@ -22,21 +25,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 +37,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 +55,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
-