From: Arkadiusz Miƛkiewicz Date: Fri, 27 Jun 2008 09:41:09 +0000 (+0000) Subject: Don't use new rpath if it's longer than old one. X-Git-Tag: auto/th/rpm-build-macros-1_464-1~1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=f9abaddbe59565d6f1e8cc7ceadcc87b228dbc09;p=packages%2Frpm-build-macros.git Don't use new rpath if it's longer than old one. Changed files: rpm.macros -> 1.464 --- diff --git a/rpm.macros b/rpm.macros index 470d88f..c9a5864 100644 --- a/rpm.macros +++ b/rpm.macros @@ -462,7 +462,8 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \ 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"; \