diff --git a/brp.diff b/brp.diff index 5b41c86..bca3cad 100644 --- a/brp.diff +++ b/brp.diff @@ -1,22 +1,6 @@ -SUSE specific brp script patches - -Index: scripts/Makefile.am -=================================================================== ---- scripts/Makefile.am.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/Makefile.am 2011-12-11 10:30:24.786227246 +0100 -@@ -25,6 +25,7 @@ EXTRA_DIST = \ - rpmconfig_SCRIPTS = \ - brp-compress brp-python-bytecompile brp-java-gcjcompile \ - brp-strip brp-strip-comment-note brp-python-hardlink \ -+ brp-suse \ - brp-strip-shared brp-strip-static-archive \ - check-files check-prereqs \ - check-buildroot check-rpaths check-rpaths-worker \ -Index: scripts/brp-strip -=================================================================== ---- scripts/brp-strip.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/brp-strip 2011-12-11 10:30:16.464621084 +0100 -@@ -15,6 +15,7 @@ esac +--- scripts/brp-strip ++++ scripts/brp-strip +@@ -15,6 +15,7 @@ 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,' | \ @@ -24,11 +8,9 @@ Index: scripts/brp-strip sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do $STRIP -g "$f" || : done -Index: scripts/brp-strip-comment-note -=================================================================== ---- scripts/brp-strip-comment-note.orig 2011-12-11 09:38:35.000000000 +0100 -+++ scripts/brp-strip-comment-note 2011-12-11 10:30:16.465621036 +0100 -@@ -16,6 +16,8 @@ esac +--- scripts/brp-strip-comment-note ++++ scripts/brp-strip-comment-note +@@ -16,6 +16,8 @@ # 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 {} \; | \ grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ @@ -37,11 +19,9 @@ Index: scripts/brp-strip-comment-note sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do note="-R .note" if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ -Index: scripts/brp-suse -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ scripts/brp-suse 2011-12-11 10:31:29.117182578 +0100 -@@ -0,0 +1,14 @@ +--- scripts/brp-suse ++++ scripts/brp-suse +@@ -0,0 +1,13 @@ +#! /bin/sh + +# If using normal root, avoid changing anything: @@ -52,7 +32,16 @@ Index: scripts/brp-suse +ls -1 /usr/lib/rpm/brp-suse.d/brp* | sort | while read script; do + if test -x "$script"; then + echo "calling $script" -+ $script ++ $script || exit 1 + fi +done -+ +--- scripts/Makefile.am ++++ scripts/Makefile.am +@@ -25,6 +25,7 @@ + rpmconfig_SCRIPTS = \ + brp-compress brp-python-bytecompile brp-java-gcjcompile \ + brp-strip brp-strip-comment-note brp-python-hardlink \ ++ brp-suse \ + brp-strip-shared brp-strip-static-archive \ + check-files check-prereqs \ + check-buildroot check-rpaths check-rpaths-worker \ diff --git a/rpm.changes b/rpm.changes index 4fd283c..23430b9 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de + +- check exit code of suse brp scripts and abort if false + ------------------------------------------------------------------- Tue Jan 17 10:28:00 UTC 2012 - saschpe@suse.de