From 22321f4ddeb1e43ee084b11b9c9d57590b77158b0d22b474918ba7a1cb925a50 Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.com>
Date: Wed, 26 Jul 2017 12:48:33 +0000
Subject: [PATCH] Accepting request 512652 from
 home:rguenther:branches:Base:System

- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching
  to account for fixed readelf no longer emitting spurious newlines
  with -W.

OBS-URL: https://build.opensuse.org/request/show/512652
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=399
---
 finddebuginfo.diff | 15 +++++++++++++--
 rpm.changes        |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/finddebuginfo.diff b/finddebuginfo.diff
index a5299e0..d43a9f1 100644
--- a/finddebuginfo.diff
+++ b/finddebuginfo.diff
@@ -1,5 +1,7 @@
---- ./scripts/find-debuginfo.sh.orig	2016-11-03 09:10:28.922784796 +0000
-+++ ./scripts/find-debuginfo.sh	2017-01-19 12:32:12.596821861 +0000
+Index: scripts/find-debuginfo.sh
+===================================================================
+--- scripts/find-debuginfo.sh.orig	2017-02-16 10:54:14.779025209 +0100
++++ scripts/find-debuginfo.sh	2017-07-26 14:39:24.338122534 +0200
 @@ -224,6 +224,20 @@ make_id_dup_link()
    debug_link "$file" "/$idfile"
  }
@@ -100,6 +102,15 @@
  
    # strip -g implies we have full symtab, don't add mini symtab in that case.
    $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f")
+@@ -366,7 +402,7 @@ if $run_dwz && type dwz >/dev/null 2>&1
+     rmdir "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz" 2>/dev/null
+     if [ -f "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" ]; then
+       id="`readelf -Wn "${RPM_BUILD_ROOT}/usr/lib/debug/.dwz/${dwz_multifile_name}" \
+-	     2>/dev/null | sed -n 's/^    Build ID: \([0-9a-f]\+\)/\1/p'`"
++	     2>/dev/null | sed -n 's/^.* Build ID: \([0-9a-f]\+\)/\1/p'`"
+       [ -n "$id" ] \
+ 	&& make_id_link "$id" "/usr/lib/debug/.dwz/${dwz_multifile_name}" .debug
+     fi
 @@ -399,12 +435,14 @@ if [ -s "$SOURCEFILE" ]; then
    # stupid cpio creates new directories in mode 0700, fixup
    find "${RPM_BUILD_ROOT}/usr/src/debug" -type d -print0 |
diff --git a/rpm.changes b/rpm.changes
index f863c85..d2da308 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jul 26 12:39:40 UTC 2017 - rguenther@suse.com
+
+- Amend finddebuginfo.diff to adjust readelf -Wn pattern matching
+  to account for fixed readelf no longer emitting spurious newlines
+  with -W.
+
 -------------------------------------------------------------------
 Mon Jul 10 12:03:08 UTC 2017 - dimstar@opensuse.org