From 0deac93da92e1ea54877deef140eb6ec9463885c Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 29 Jul 2011 17:36:37 +0000 Subject: [PATCH 1/1] - for .la symlinks generate libtool(symlink), not libtool(target) Provides Changed files: rpm-libtool-deps.patch -> 1.10 --- rpm-libtool-deps.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rpm-libtool-deps.patch b/rpm-libtool-deps.patch index 450093f..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,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 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) -- 2.43.0