- normalize rpath before processing.

  this fixes:

/usr/bin/gij: RPATH=/usr/lib64/../lib64:/usr/lib64/gcj-4.2.4
/usr/bin/jv-convert: RPATH=/usr/lib64/../lib64

  into:

$ chrpath -l /usr/bin/gij
/usr/bin/gij: RPATH=/usr/lib64/gcj-4.3.0-9
$ chrpath -l /usr/bin/jv-convert
/usr/bin/jv-convert: no rpath or runpath tag found.

Changed files:
    rpm.macros -> 1.451

diff --git a/rpm.macros b/rpm.macros
index ce025efadc515e1fd50c0407d8b93dbe8f484b38..5afd11c17b11aad4daf2e06357cd6b3651be8126 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -449,6 +449,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
                        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`
                                        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"; \