From: Paweł Sikora <pawels@alatek.krakow.pl>
Date: Mon, 24 Sep 2012 10:51:24 +0000 (+0200)
Subject: fix debuginfo patch (correct merge from 4.5 branch), release 8.
X-Git-Tag: auto/th/rpm-5.4.10-8
X-Git-Url: https://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=ce608720cb7c7e45de92ced68603b21d4d7a530f

fix debuginfo patch (correct merge from 4.5 branch), release 8.
---

diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch
index 949bdf2..f1b160d 100644
--- a/rpm-debuginfo.patch
+++ b/rpm-debuginfo.patch
@@ -1,14 +1,16 @@
 --- 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,8 +92,10 @@ strip_to_debug()
+@@ -92,8 +92,12 @@ strip_to_debug()
    esac
    [ -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
++  local t=$(mktemp "/tmp/rpm.stripped.XXXXXX")
++  objcopy --compress-debug-sections "$2" || exit
++  eu-strip --remove-comment -f "$1" "$2" -o "$t" || exit
++  rm -f "$t"
 +  chmod 444 "$1" || exit
  }
  
diff --git a/rpm.spec b/rpm.spec
index 876d02b..e90200c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -48,7 +48,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	7
+Release:	8
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -772,7 +772,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch12 -p1
 %patch13 -p1
 %patch14 -p0
-#patch15 -p1
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1