X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-libtool-deps.patch;h=4dc62f4e7c64f29e57e65c144a33566aaf1ca66a;hb=5b9fce5b6357f97edead710813667e3f1a3a0dda;hp=ef2088707c6f61f1cd6079e1c719d10d7cbeb5d8;hpb=325a532219bff8dddbbc8166fde61db76084d152;p=packages%2Frpm.git diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch index ef20887..4dc62f4 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,6 +5,8 @@ +@@ -5,15 +5,17 @@ exit 0 } @@ -9,17 +9,18 @@ case $1 in -P|--provides) shift -@@ -13,7 +15,8 @@ +- 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" 2> /dev/null || echo "$possible"`" -+ if file "$possible" | grep -iq 'libtool library file' 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)