diff --git a/rpm-5.2.1-file-5.30.patch b/rpm-5.2.1-file-5.30.patch new file mode 100644 index 0000000..919d9e3 --- /dev/null +++ b/rpm-5.2.1-file-5.30.patch @@ -0,0 +1,24 @@ +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" diff --git a/rpm.spec b/rpm.spec index a426b99..0c4a815 100644 --- a/rpm.spec +++ b/rpm.spec @@ -33,7 +33,7 @@ Name: rpm Version: 5.2.1 -Release: 29mamba +Release: 30mamba Summary: The RPM package management system Group: System/Management Vendor: openmamba @@ -103,6 +103,7 @@ Patch64: rpm-5.2.1-build-from-tarball.patch Patch65: rpm-5.2.1-build-fix-arm.patch Patch66: rpm-5.2.1-find_lang_support_localized_qt_and_man_files.patch Patch67: rpm-5.2.1-dont-fail-on-postun.patch +Patch68: rpm-5.2.1-file-5.30.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -309,6 +310,7 @@ This package should be installed if you want to develop Python programs that wil %patch65 -p1 %patch66 -p1 %patch67 -p1 +%patch68 -p1 mkdir platform-macros cd platform-macros @@ -630,6 +632,9 @@ fi %endif %changelog +* Fri Mar 03 2017 Silvan Calarco 5.2.1-30mamba +- added patch for file 5.30 + * Thu Aug 25 2016 Silvan Calarco 5.2.1-29mamba - further increase rescans in silent-loop-detection patch