From 360285586e8c136815d572dd16538f945f290496 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Wed, 9 Jun 2021 17:10:02 -0400
Subject: [PATCH] Resolves: rhbz1947876

---
 elfutils.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/elfutils.spec b/elfutils.spec
index 56da61c..ca49812 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -1,6 +1,6 @@
 Name: elfutils
 Version: 0.185
-%global baserelease 2
+%global baserelease 3
 Release: %{baserelease}%{?dist}
 URL: http://elfutils.org/
 %global source_url ftp://sourceware.org/pub/elfutils/%{version}/
@@ -14,7 +14,8 @@ Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
 Requires: elfutils-libelf%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
-Recommends: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
+# see Supplements: instead
+# Recommends: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
 %else
 Requires: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
 %endif
@@ -102,11 +103,6 @@ Provides: elfutils-devel%{depsuffix} = %{version}-%{release}
 %endif
 Requires: elfutils-libs%{depsuffix} = %{version}-%{release}
 Requires: elfutils-libelf-devel%{depsuffix} = %{version}-%{release}
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
-Recommends: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release}
-%else
-Requires: elfutils-debuginfod-client-devel%{depsuffix} = %{version}-%{release}
-%endif
 Obsoletes: elfutils-devel-static < 0.180-5
 
 %description devel
@@ -186,6 +182,13 @@ License: GPLv3+ and (GPLv2+ or LGPLv3+)
 %if 0%{!?_isa:1}
 Provides: elfutils-debuginfod-client%{depsuffix} = %{version}-%{release}
 %endif
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 20
+# Instead of the weak forward dependency from -libs to -debuginfod-client,
+# we'll add weak reverse dependencies from some of the many programs that
+# indirectly load this.  This lets the base @core compose omit this library.
+Supplements: systemtap-client perf gdb binutils elfutils ltrace dyninst
+Supplements: valgrind annocheck bpftrace dwarves libabigail
+%endif
 
 %package debuginfod-client-devel
 Summary: Libraries and headers to build debuginfod client applications
@@ -410,6 +413,9 @@ exit 0
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Wed Jun 09 2021 Frank Ch. Eigler <fche@redhat.com> - 0.185-3
+- RHBZ1947876 - turn -debuginfod-client into a weak reverse dependency.
+
 * Mon May 31 2021 Mark Wielaard <mjw@redhat.com> - 0.185-2
 - Allow failing make check