- (after hawk got his autotag) switch back to readlink but additionally translate...

Changed files:
    rpm.macros -> 1.459

diff --git a/rpm.macros b/rpm.macros
index 002bff25fbe548d5154ac0abb55e229fc824ffea..9e2a4f30657cf765cdff3177f068376446876e62 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -455,7 +455,13 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                        rpath= ; \
                        chmod u+w "$file"; \
                        for dir in $(chrpath -l "$file" | awk '/RPATH=/ { gsub(/.*RPATH=/,""); gsub(/:/," "); print $0 }'); do \
-                                       dir=$(%{__python} -c 'import sys, os; print os.path.normpath(sys.argv[1]);' "$dir"); \
+                                       # translate $ORIGIN to real path, so that normalize path \
+                                       # would work with readlink and secondly we don't need to \
+                                       # relocate the binaries in rpm based distro \
+                                       local f=${file#$RPM_BUILD_ROOT}; \
+                                       local origin=${f%/*}; \
+                                       dir=$(echo $dir | sed -e "s,\$ORIGIN,$origin,g"); \
+                                       dir=$(readlink -m "$dir"); \
                                        case $dir in \
                                        /home/* | /tmp/* | /usr/lib | /usr/lib64 | /lib | /lib64 | /usr/local/lib | /usr/local/lib64 | /usr/X11R6/lib | /usr/X11R6/lib64 ) \
                                                echo "remove-rpath: $dir in $file"; \