- up to 1.661; RUNPATH fix

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index f318959fc5f67ee21c5613ea5cad700ed65881d6..df6f4d6caa666db0745f23c75f8227dfcda03e7c 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.660
+%define                rpm_macros_rev  1.661
 %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 124af730652765c641b322f889587e58274bda3a..ee6b6851f0649c68013934bd5232f99d2e4efeb3 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -653,7 +653,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                while read file; do \
                        rpath= ; \
                        chmod u+w "$file"; \
-                       for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*R(|UN)PATH=/,""); gsub(/:/," "); print $0 }'); do \
+                       for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }'); do \
                                        case $dir in \
                                        '$ORIGIN' ) \
                                                if [ "$rpath" = "" ] ; then rpath="$dir" ; \