From dabd097bc0d24f4f5ceaeba4be53435db2fad0c8 Mon Sep 17 00:00:00 2001 From: Lubos Kardos Date: Tue, 31 Mar 2015 10:51:01 +0200 Subject: [PATCH] - Fix wrong use of variable strip_g in find-debuginfo.sh - resolves: #1207434 --- rpm-4.10.0-minidebuginfo.patch | 2 +- rpm-4.11.1-sepdebugcrcfix.patch | 2 +- rpm.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rpm-4.10.0-minidebuginfo.patch b/rpm-4.10.0-minidebuginfo.patch index f284fcd..324fb81 100644 --- a/rpm-4.10.0-minidebuginfo.patch +++ b/rpm-4.10.0-minidebuginfo.patch @@ -91,7 +91,7 @@ fi + # strip -g implies we have full symtab, don't add mini symtab in that case. -+ strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") ++ $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") + if [ -n "$id" ]; then make_id_link "$id" "$dn/$(basename $f)" diff --git a/rpm-4.11.1-sepdebugcrcfix.patch b/rpm-4.11.1-sepdebugcrcfix.patch index 29c364e..4ea5168 100644 --- a/rpm-4.11.1-sepdebugcrcfix.patch +++ b/rpm-4.11.1-sepdebugcrcfix.patch @@ -29,7 +29,7 @@ @@ -316,6 +318,8 @@ # strip -g implies we have full symtab, don't add mini symtab in that case. - strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") + $strip_g || ($include_minidebug && add_minidebug "${debugfn}" "$f") + + echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE" diff --git a/rpm.spec b/rpm.spec index 0c04c0f..d7de9f9 100644 --- a/rpm.spec +++ b/rpm.spec @@ -27,7 +27,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}12%{?dist} +Release: %{?snapver:0.%{snapver}.}13%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2 @@ -547,6 +547,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Tue Mar 31 2015 Lubos Kardos 4.12.0-13 +- Fix wrong use of variable strip_g in find-debuginfo.sh (#1207434) + * Mon Mar 30 2015 Lubos Kardos 4.12.0-12 - Fix segmentation fault (#1206750)