[packages/rpm-build-macros] - version 1.662: fixed chrpath mawk compatibility (| doesn't allow empty argument)

qboosh qboosh at pld-linux.org
Sun May 12 08:21:10 CEST 2013


commit d8ba59fb9a875843dda56be783c09b2f2a5bf1d6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 12 08:21:06 2013 +0200

    - version 1.662: fixed chrpath mawk compatibility (| doesn't allow empty argument)

 rpm-build-macros.spec | 2 +-
 rpm.macros            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 813686d..5cc5ab5 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.661
+%define		rpm_macros_rev	1.662
 %define		find_lang_rev	1.36
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
diff --git a/rpm.macros b/rpm.macros
index 7d85bb5..6ee8d6b 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -653,7 +653,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
 		while read file; do \
 			rpath= ; \
 			chmod u+w "$file"; \
-			for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }'); do \
+			for dir in $(chrpath -l "$file" | awk '/(R|RUN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }'); do \
 					case $dir in \
 					'$ORIGIN' ) \
 						if [ "$rpath" = "" ] ; then rpath="$dir" ; \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/d8ba59fb9a875843dda56be783c09b2f2a5bf1d6



More information about the pld-cvs-commit mailing list