- revert to python solution in %__spec_install_post_chrpath, readlink causes

  RPATH to be completly removed from libraries where just $ORIGIN is used
  (ie. in glibc) making them unusable, python on the other hand fails with
  $ORIGIN/../something, this part of macros needs more investigation to find
  100% working sollution, for now python works in much more cases

Changed files:
    rpm.macros -> 1.458

diff --git a/rpm.macros b/rpm.macros
index 3fbe5cd886c313a6c6fc5bfed1782b2d198a98d3..002bff25fbe548d5154ac0abb55e229fc824ffea 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -455,7 +455,7 @@ 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 \
-                                       dir=$(readlink -m "$dir"); \
+                                       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"; \