diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | brp-compress | 2 | ||||
| -rwxr-xr-x | brp-strip | 2 | ||||
| -rwxr-xr-x | brp-strip-comment-note | 2 | ||||
| -rwxr-xr-x | brp-strip-static-archive | 2 | ||||
| -rwxr-xr-x | find-debuginfo.sh | 2 |
6 files changed, 7 insertions, 5 deletions
@@ -5,6 +5,8 @@ o add -r flag to find-debuginfo.sh to invoke eu-strip --reloc-debug-sections o drop useless rpm5 bits (less divergence with upstream) - kill unused find-provides.perl.in +- prevent RPM_BUILD_ROOT to break brp-* scripts if it contains spaces + (rpm.org#843) Version 1.151 - 26 Jul 2012, by Thierry Vignaud - fix %_libexecdir that changed to %_libdir when mga forked mdv diff --git a/brp-compress b/brp-compress index b1bf0dc..6912d66 100755 --- a/brp-compress +++ b/brp-compress @@ -7,7 +7,7 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then exit 0 fi -cd $RPM_BUILD_ROOT +cd "$RPM_BUILD_ROOT" # Compress man pages COMPRESS="bzip2 -9" @@ -5,7 +5,7 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then fi # Strip ELF binaries -for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ +for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep -v ' shared object,' | \ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do diff --git a/brp-strip-comment-note b/brp-strip-comment-note index 0985795..3d7ad4e 100755 --- a/brp-strip-comment-note +++ b/brp-strip-comment-note @@ -6,7 +6,7 @@ fi # Strip .comment and .note sections (the latter only if it is not allocated) # for already stripped elf files in the build root -for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ +for f in `find "$RPM_BUILD_ROOT" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do note="-R .note" diff --git a/brp-strip-static-archive b/brp-strip-static-archive index 6831239..366d597 100755 --- a/brp-strip-static-archive +++ b/brp-strip-static-archive @@ -5,7 +5,7 @@ if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then fi # Strip static libraries. -for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \ +for f in `find "$RPM_BUILD_ROOT" -type f -a -exec file {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ grep 'current ar archive' | \ sed -n -e 's/^\(.*\):[ ]*current ar archive/\1/p'`; do diff --git a/find-debuginfo.sh b/find-debuginfo.sh index ef2c5c4..a0a83e4 100755 --- a/find-debuginfo.sh +++ b/find-debuginfo.sh @@ -253,7 +253,7 @@ done || exit # For each symlink whose target has a .debug file, # make a .debug symlink to that file. -find $RPM_BUILD_ROOT ! -path "${debugdir}/*" -type l -print | +find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*" -type l -print | while read f do t=$(readlink -m "$f").debug |