- keep ORIGIN, we need it because some absolute paths are too long to be in rpath...

Changed files:
    rpm.macros -> 1.463

diff --git a/rpm.macros b/rpm.macros
index 6b357744804288876ef66521aea18767c542aa56..470d88f6c907365f1fa695894325491c67054ed2 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -455,12 +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 \
-                                       # 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"); \
+                                       case $dir in \
+                                       '$ORIGIN' ) \
+                                               if [ "$rpath" = "" ] ; then rpath="$dir" ; \
+                                               else rpath="$rpath:$dir" ; fi ; \
+                                               continue ; \
+                                               ;; \
+                                       esac ; \
                                        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 ) \