[packages/rpm] updated debuginfo patch to 5.4

[baggins]

commit 148c99574023d077db6ff1f5c60039db123a54e9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Aug 25 19:08:36 2012 +0200

    updated debuginfo patch to 5.4

 rpm-debuginfo.patch | 13 ++++++++-----
 rpm.spec            |  3 +--
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 0946c94..148d5fe 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -714,8 +714,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch27 -p1
 %patch34 -p1
 %patch35 -p0
-# needs update to 5.4
-#%patch36 -p1
+%patch36 -p1
 %patch37 -p1
 %patch41 -p1
 %patch42 -p1
diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 2ea8c59..248657b 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -38,13 +38,16 @@
  %{nil}
 --- rpm-5.3.1/scripts/find-debuginfo.sh.wiget	2009-09-10 03:52:13.000000000 +0200
 +++ rpm-5.3.1/scripts/find-debuginfo.sh	2010-05-30 16:53:33.275994510 +0200
-@@ -92,7 +92,8 @@ strip_to_debug()
-   $strip_g && case "$(file -bi "$2")" in
-   application/x-sharedlib,*) g=-g ;;
+@@ -92,8 +92,10 @@ strip_to_debug()
    esac
--  eu-strip --remove-comment $g -f "$1" "$2" || exit
+   [ -n "$EXCLUDE_FULL_REGEXP" ] && grep -E -q "$EXCLUDE_FULL_REGEXP" <<< "$2" && g=-g
+ 
+-  eu-strip --remove-comment $g $([ -n "$DISABLE_DEBUG" ] || echo -f "$1") "$2" || exit  
+-  [ -n "$DISABLE_DEBUG" ] || chmod 444 "$1" || exit
++  [ -n "$DISABLE_DEBUG" ] && return
 +  objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit
 +  objcopy --add-gnu-debuglink="$1" "$2" || exit
-   chmod 444 "$1" || exit
++  chmod 444 "$1" || exit
  }
  
+ # Make a relative symlink to $1 called $3$2