SOURCES: rpm.macros - revert to python solution in %__spec_install_post_chr...

[hawk]

Author: hawk                         Date: Wed Jun 11 15:09:21 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 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

---- Files affected:
SOURCES:
   rpm.macros (1.457 -> 1.458) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.457 SOURCES/rpm.macros:1.458
--- SOURCES/rpm.macros:1.457	Wed Jun 11 16:34:56 2008
+++ SOURCES/rpm.macros	Wed Jun 11 17:09:15 2008
@@ -455,7 +455,7 @@
 			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"; \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.457&r2=1.458&f=u