SOURCES: rpm.macros Don't use new rpath if it's longer than old one.

arekm arekm at pld-linux.org
Fri Jun 27 11:41:15 CEST 2008


Author: arekm                        Date: Fri Jun 27 09:41:15 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
Don't use new rpath if it's longer than old one.

---- Files affected:
SOURCES:
   rpm.macros (1.463 -> 1.464) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.463 SOURCES/rpm.macros:1.464
--- SOURCES/rpm.macros:1.463	Wed Jun 25 21:12:34 2008
+++ SOURCES/rpm.macros	Fri Jun 27 11:41:09 2008
@@ -462,7 +462,8 @@
 						continue ; \
 						;; \
 					esac ; \
-					dir=$(readlink -m "$dir"); \
+					newdir=$(readlink -m "$dir"); \
+					[ ${#newdir} -le ${#dir} ] && dir=$newdir; \
 					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.463&r2=1.464&f=u



More information about the pld-cvs-commit mailing list