SOURCES: rpm.macros - drop python requirement from %__spec_install_post_chr...

glen glen at pld-linux.org
Tue Jun 3 17:31:33 CEST 2008


Author: glen                         Date: Tue Jun  3 15:31:33 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- drop python requirement from %__spec_install_post_chrpath:
  $ readlink -m /usr/lib64/../lib64:/usr/lib64/gcj-4.2.4
  /usr/lib64:/usr/lib64/gcj-4.2.4
  $ readlink -m /usr/lib64/../lib64:/usr/lib64/gcj-4.2.4:/usr/lib64/../lib64
  /usr/lib64:/usr/lib64/gcj-4.2.4:/usr/lib64
  $ readlink -m /usr/lib64/../lib64
  /usr/lib64

---- Files affected:
SOURCES:
   rpm.macros (1.455 -> 1.456) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.455 SOURCES/rpm.macros:1.456
--- SOURCES/rpm.macros:1.455	Tue Jun  3 17:29:32 2008
+++ SOURCES/rpm.macros	Tue Jun  3 17:31:27 2008
@@ -456,7 +456,7 @@
 			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`; \
+					dir=`readlink -m $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.455&r2=1.456&f=u



More information about the pld-cvs-commit mailing list