From 1e61f504d7525d89f0acf8c61f5f36f393c37de2 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: Apr 08 2020 13:33:26 +0000
Subject: Remove manual perf-debuginfo (rhbz 1822110)


---

diff --git a/kernel-tools.spec b/kernel-tools.spec
index 45939b3..fd7395b 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -62,10 +62,6 @@
 %global kversion 5.%{base_sublevel}
 %global KVERREL %{version}-%{release}.%{_target_cpu}
 
-%global _debuginfo_subpackages 1
-%undefine _include_gdb_index
-%undefine _include_minidebuginfo
-
 # perf needs this
 %undefine _strict_symbol_defs_build
 
@@ -145,19 +141,6 @@ of the Linux kernel.
 written in the Python programming language to use the interface \
 to manipulate perf events.
 
-%package -n perf-debuginfo
-Summary: Debug information for package perf
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
-AutoReqProv: no
-%description -n perf-debuginfo
-This package provides debug information for the perf package.
-
-# Note that this pattern only works right to match the .build-id
-# symlinks because of the trailing nonmatching alternation and
-# the leading .*, because of find-debuginfo.sh's buggy handling
-# of matching the pattern against the symlinks file.
-%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/perf(\.debug)?|.*%%{_libexecdir}/perf-core/.*|.*%%{_libdir}/traceevent/plugins/.*|.*%%{_libdir}/libperf-jvmti.so(\.debug)?|XXX' -o perf-debuginfo.list}
-
 %package -n python3-perf
 Summary: %{pythonperfsum}
 %{?python_provide:%python_provide python3-perf}
@@ -408,8 +391,6 @@ popd
 %license linux-%{kversion}/COPYING
 %{python3_sitearch}/*
 
-%files -f perf-debuginfo.list -n perf-debuginfo
-
 %files -n kernel-tools -f cpupower.lang
 %{_bindir}/cpupower
 %{_datadir}/bash-completion/completions/cpupower
@@ -484,6 +465,9 @@ popd
 %license linux-%{kversion}/COPYING
 
 %changelog
+* Wed Apr 08 2020 Justin Forbes <jforbes@fedoraproject.org>
+- Remove manual perf-debuginfo left from kernel (rhbz 1822110)
+
 * Mon Mar 30 2020 Justin Forbes <jforbes@fedoraproject.org>
 - Add BuildRequires of libcap-devel for turbostat changes
 - Linux v5.6