X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-libtool-deps.patch;h=450093f59d78ea9cccfd0bac6f141fb584607f8e;hb=b0daadbc172d3607f78308b108ec821506c32ce3;hp=6b6a8612fb9902ca59b29ba017ebb66119b8163f;hpb=c74077dc412cc63d6c7e79af5ca8a944a66979c5;p=packages%2Frpm.git

diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch
index 6b6a861..450093f 100644
--- a/rpm-libtool-deps.patch
+++ b/rpm-libtool-deps.patch
@@ -1,22 +1,65 @@
-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,18 @@
+     exit 0
+ }
+ 
++pkgname="$3"
++
+ case $1 in
+ -P|--provides)
+     shift
+-    RPM_BUILD_ROOT="$1"
++    RPM_BUILD_ROOT="`readlink -f "$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 ; the
++	    if file "$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" 2> /dev/null || echo "$dep"`"
- 		    echo "libtool($dep)"
+@@ -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 -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