commit b546bcc55602717a5e7fb366367b80312e20e9d8
Author: Arkadiusz Miśkiewicz <[email protected]>
Date:   Wed Apr 17 23:45:32 2013 +0200

    - up to 1.661; RUNPATH fix

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index f318959..df6f4d6 100644
--- 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 124af73..ee6b685 100644
--- 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" ; \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/b546bcc55602717a5e7fb366367b80312e20e9d8

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to