From fa230ece286ecd84477a2bc16593d08af957ab23 Mon Sep 17 00:00:00 2001
From: Lubos Kardos <lkardos@redhat.com>
Date: Fri, 27 Mar 2015 16:22:46 +0100
Subject: [PATCH] - Pass _find_debuginfo_opts -g to eu-strip for executables -
 resolves: #1186563 - add_minidebug is not ran when strip_g is set - related:
 #1186563

---
 rpm-4.10.0-minidebuginfo.patch  | 4 ++--
 rpm-4.11.1-sepdebugcrcfix.patch | 7 ++++---
 rpm.spec                        | 8 +++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/rpm-4.10.0-minidebuginfo.patch b/rpm-4.10.0-minidebuginfo.patch
index 54c0e32..f284fcd 100644
--- a/rpm-4.10.0-minidebuginfo.patch
+++ b/rpm-4.10.0-minidebuginfo.patch
@@ -90,8 +90,8 @@
      chmod u-w "$f"
    fi
  
-+  $include_minidebug && add_minidebug "${debugfn}" "$f"
-+
++  # strip -g implies we have full symtab, don't add mini symtab in that case.
++  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 520198e..29c364e 100644
--- a/rpm-4.11.1-sepdebugcrcfix.patch
+++ b/rpm-4.11.1-sepdebugcrcfix.patch
@@ -26,10 +26,11 @@
  
  debugdir="${RPM_BUILD_ROOT}/usr/lib/debug"
  
-@@ -316,6 +318,7 @@ while read nlinks inum f; do
- 
-   $include_minidebug && add_minidebug "${debugfn}" "$f"
+@@ -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")
++
 +  echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
    
    if [ -n "$id" ]; then
diff --git a/rpm.spec b/rpm.spec
index 39a075a..5882087 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}.}9%{?dist}
+Release: %{?snapver:0.%{snapver}.}11%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -61,6 +61,8 @@ Patch102: rpm-4.12.0-archive-endian.patch
 Patch103: 0001-Fix-find-debuginfo.sh-for-ELF-with-file-warnings.patch
 # Fix --excludedocs option (#1192625)
 Patch104: rpm-4.12.0-exclude-doc.patch
+# Pass _find_debuginfo_opts -g to eu-strip for executables (#1186563)
+Patch105: rpm-4.12.0-eu-strip-g-option.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -545,6 +547,10 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Fri Mar 27 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-11
+- Pass _find_debuginfo_opts -g to eu-strip for executables (#1186563)
+- add_minidebug is not ran when strip_g is set (#1186563)
+
 * Fri Mar 20 2015 Lubos Kardos <lkardos@redhat.com> 4.12.0-10
 - Fix "--excludedocs" option (#1192625)