rpm/rpm-5.2.1-file-5.30.patch

25 lines
1.4 KiB
Diff

diff -Nru rpm-5.2.1.orig/scripts/brp-strip-comment-note rpm-5.2.1/scripts/brp-strip-comment-note
--- rpm-5.2.1.orig/scripts/brp-strip-comment-note 2007-06-20 18:56:47.000000000 +0200
+++ rpm-5.2.1/scripts/brp-strip-comment-note 2017-03-03 11:40:53.960767333 +0100
@@ -18,7 +18,7 @@
# 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" | \
- sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do
+ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do
note="-R .note"
if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \
grep ALLOC >/dev/null; then
diff -Nru rpm-5.2.1.orig/scripts/find-debuginfo.sh rpm-5.2.1/scripts/find-debuginfo.sh
--- rpm-5.2.1.orig/scripts/find-debuginfo.sh 2009-05-12 18:02:39.000000000 +0200
+++ rpm-5.2.1/scripts/find-debuginfo.sh 2017-03-03 11:40:35.698577512 +0100
@@ -176,7 +176,7 @@
find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
\( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
-print |
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
+file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped.*/\1/p' |
xargs --no-run-if-empty stat -c '%h %D_%i %n' |
while read nlinks inum f; do
get_debugfn "$f"