- handle RUNPATH, too

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 881a64587ddf251a3584a59cf43167a053c4a5ad..f318959fc5f67ee21c5613ea5cad700ed65881d6 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.659
+%define                rpm_macros_rev  1.660
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 93f58726e3088773fc6389bf05a0976a721c2890..124af730652765c641b322f889587e58274bda3a 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -631,7 +631,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
 fi; }; __spec_install_post_strip } } }
 
 #-----------------------------------------------------------------
-# remove all RPATH from executable binaries and shared object files
+# remove all RPATH/RUNPATH from executable binaries and shared object files
 #
 # Requires: find, awk, cut, xargs, chrpath, uname
 #
@@ -648,12 +648,12 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \
        fi; \
        if [ -n "$objs" ]; then \
-               printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \
+               printf "Remove RPATH/RUNPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \
                echo "$objs" | \
                while read file; do \
                        rpath= ; \
                        chmod u+w "$file"; \
-                       for dir in $(chrpath -l "$file" | awk '/RPATH=/ { gsub(/.*RPATH=/,""); gsub(/:/," "); print $0 }'); do \
+                       for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*R(|UN)PATH=/,""); gsub(/:/," "); print $0 }'); do \
                                        case $dir in \
                                        '$ORIGIN' ) \
                                                if [ "$rpath" = "" ] ; then rpath="$dir" ; \