From c2620a4c45e129e19afe4df8acebcacc2b8ff9f1 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 2 Apr 2015 21:34:18 +0200
Subject: [PATCH] Suggest s/debuginfo-install/dnf debuginfo-install/ (BZ
 1208650, Omair Majid).

---
 gdb-6.6-buildid-locate-rpm.patch | 5 ++++-
 gdb.spec                         | 9 ++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch
index 8dc4bcc..65a4b53 100644
--- a/gdb-6.6-buildid-locate-rpm.patch
+++ b/gdb-6.6-buildid-locate-rpm.patch
@@ -1109,7 +1109,7 @@ Index: gdb-7.8.50.20141228/gdb/build-id.c
  
  #define BUILD_ID_VERBOSE_NONE 0
  #define BUILD_ID_VERBOSE_FILENAMES 1
-@@ -664,8 +665,360 @@ build_id_to_filename (const struct elf_b
+@@ -664,8 +665,363 @@ build_id_to_filename (const struct elf_b
    return result;
  }
  
@@ -1409,6 +1409,9 @@ Index: gdb-7.8.50.20141228/gdb/build-id.c
 +	 (int (*) (const void *, const void *)) missing_rpm_list_compar);
 +
 +  printf_unfiltered (_("Missing separate debuginfos, use: %s"),
++#ifdef DNF_DEBUGINFO_INSTALL
++		     "dnf "
++#endif
 +		     "debuginfo-install");
 +  for (array_iter = array; array_iter < array + missing_rpm_list_entries;
 +       array_iter++)
diff --git a/gdb.spec b/gdb.spec
index 2b41924..291c84f 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -26,7 +26,7 @@ Version: 7.9
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL
 Group: Development/Debuggers
@@ -892,6 +892,10 @@ cd %{gdb_build}$fprofile
 export CFLAGS="$RPM_OPT_FLAGS %{?_with_asan:-fsanitize=address}"
 export LDFLAGS="%{?__global_ldflags} %{?_with_asan:-fsanitize=address}"
 
+%if 0%{!?rhel:1} || 0%{?rhel} > 7
+CFLAGS="$CFLAGS -DDNF_DEBUGINFO_INSTALL"
+%endif
+
 # --htmldir and --pdfdir are not used as they are used from %{gdb_build}.
 ../configure							\
 	--prefix=%{_prefix}					\
@@ -1320,6 +1324,9 @@ then
 fi
 
 %changelog
+* Thu Apr  2 2015 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.9-11.fc22
+- Suggest s/debuginfo-install/dnf debuginfo-install/ (BZ 1208650, Omair Majid).
+
 * Sun Feb 22 2015 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.9-10.fc22
 - Rebase to the final 7.9 release.