From b3c032b3c9fa2e1e450785d7f0e821f6ce1acf80 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 5 Apr 2019 10:23:38 -0700
Subject: [PATCH] Remove oprofile from f30 and f31 (replace with perf)

oprofile was retired from F30+, obsoleted by perf. So replace it
with perf in comps. Also drop eclipse-linuxtools-oprofile, which
requires it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-f30.xml.in | 3 +--
 comps-f31.xml.in | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 04c311dc..bb37238a 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -408,7 +408,7 @@
       <packagereq type="default">elfutils</packagereq>
       <packagereq type="default">indent</packagereq>
       <packagereq basearchonly="true" type="default">ltrace</packagereq>
-      <packagereq basearchonly="true" type="default">oprofile</packagereq>
+      <packagereq basearchonly="true" type="default">perf</packagereq>
       <packagereq type="default">valgrind</packagereq>
       <packagereq type="optional">astyle</packagereq>
       <packagereq type="optional">cbmc</packagereq>
@@ -1185,7 +1185,6 @@
       <packagereq type="default">eclipse-linuxtools-gprof</packagereq>
       <packagereq type="default">eclipse-linuxtools-javadocs</packagereq>
       <packagereq type="default">eclipse-linuxtools-libhover</packagereq>
-      <packagereq type="default">eclipse-linuxtools-oprofile</packagereq>
       <packagereq type="default">eclipse-linuxtools-perf</packagereq>
       <packagereq type="default">eclipse-linuxtools-rpm-editor</packagereq>
       <packagereq type="default">eclipse-linuxtools-systemtap</packagereq>
diff --git a/comps-f31.xml.in b/comps-f31.xml.in
index 04c311dc..bb37238a 100644
--- a/comps-f31.xml.in
+++ b/comps-f31.xml.in
@@ -408,7 +408,7 @@
       <packagereq type="default">elfutils</packagereq>
       <packagereq type="default">indent</packagereq>
       <packagereq basearchonly="true" type="default">ltrace</packagereq>
-      <packagereq basearchonly="true" type="default">oprofile</packagereq>
+      <packagereq basearchonly="true" type="default">perf</packagereq>
       <packagereq type="default">valgrind</packagereq>
       <packagereq type="optional">astyle</packagereq>
       <packagereq type="optional">cbmc</packagereq>
@@ -1185,7 +1185,6 @@
       <packagereq type="default">eclipse-linuxtools-gprof</packagereq>
       <packagereq type="default">eclipse-linuxtools-javadocs</packagereq>
       <packagereq type="default">eclipse-linuxtools-libhover</packagereq>
-      <packagereq type="default">eclipse-linuxtools-oprofile</packagereq>
       <packagereq type="default">eclipse-linuxtools-perf</packagereq>
       <packagereq type="default">eclipse-linuxtools-rpm-editor</packagereq>
       <packagereq type="default">eclipse-linuxtools-systemtap</packagereq>