- next batch of patch updates

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

--- 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 -Eiq '^# Generated by (libtool|ltmain.sh)' "$possible" 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 +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