- 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 bbcb65407de9961ab6ced3331bb9a4fdd6bc581d..4dc62f4e7c64f29e57e65c144a33566aaf1ca66a 100644 (file)
--- a/rpm-libtool-deps.patch
+++ b/rpm-libtool-deps.patch
@@ -1,21 +1,64 @@
-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
-@@ -13,7 +13,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
+ }
+ 
++pkgname="$3"
++
+ case $1 in
+ -P|--provides)
+     shift
+-    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"`"
-+          if file "$possible" | grep -iq 'libtool library file' 2> /dev/null ; the
++          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
-@@ -30,6 +31,7 @@
-           do
-               case "$dep" in
-               /*.la)
-+                  $dep="`readlink -f "$dep"`"
-                   echo "libtool($dep)"
+@@ -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 -e "s,^dependency_libs='\(.*\)',\1,g"`
+-          do
+-              case "$dep" in
+-              /*.la)
+-                  echo "libtool($dep)"
++    case $pkgname in
++    *-devel)
++          while read possible ; do
++              case "$possible" in
++              *.la)
++                  for dep in `grep '^dependency_libs=' "$possible" 2> /dev/null | \
++                              sed -e "s,^dependency_libs='\(.*\)',\1,g"`
++                  do
++                      case "$dep" in
++                      /*.la)
++                          dep="`readlink -f "$dep" 2> /dev/null || echo "$dep"`"
++                          echo "libtool($dep)"
++                          ;;
++                      esac
++                  done
                    ;;
                esac
+           done
+-          ;;
+-      esac
+-    done
+-    ;;
++     ;;
++     *)
++            cat > /dev/null
++     ;;
++     esac
+ esac
+ exit 0