Author: pluto Date: Tue May 20 13:04:12 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- 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.
---- Files affected:
SOURCES:
rpm.macros (1.450 -> 1.451)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.450 SOURCES/rpm.macros:1.451
--- SOURCES/rpm.macros:1.450 Mon May 5 15:56:05 2008
+++ SOURCES/rpm.macros Tue May 20 15:04:06 2008
@@ -449,6 +449,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`
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.450&r2=1.451&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
