X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-libtool-deps.patch;h=443d1fde91580080c006bed530f24f6575ee1c19;hb=1e03ccf583ba2ac0b38268fb5f71cea68f935bad;hp=450093f59d78ea9cccfd0bac6f141fb584607f8e;hpb=a10a81f87362b9e62a8b9857bac556d8c5681729;p=packages%2Frpm.git diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch index 450093f..443d1fd 100644 --- a/rpm-libtool-deps.patch +++ b/rpm-libtool-deps.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -5,15 +5,17 @@ exit 0 } @@ -10,18 +10,17 @@ -P|--provides) shift - RPM_BUILD_ROOT="$1" -+ RPM_BUILD_ROOT="`readlink -f "$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 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 +25,28 @@ +@@ -22,21 +24,28 @@ done ;; -R|--requires)