From 91e13df5d43b3d0aaeb8b4f2879cb2f04ae1ab3f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 7 Jun 2021 13:57:00 -0500 Subject: [PATCH] Remove conflicts which breaks perf built dynamically Signed-off-by: Justin M. Forbes --- libtraceevent.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libtraceevent.spec b/libtraceevent.spec index c9aa2cd..e3cbe4e 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -5,7 +5,7 @@ Name: libtraceevent Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ Summary: Library to parse raw trace event formats @@ -19,8 +19,6 @@ Source0: https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc -# The libtraceevent is meant to be used by perf, trace-cmd etc. in the future, before it's ready in perf, let's add a conflict -Conflicts: perf %global __provides_exclude_from ^%{_libdir}/traceevent/plugins @@ -64,6 +62,9 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/pkgconfig/libtraceevent.pc %changelog +* Mon Jun 07 2021 Justin Forbes +- Remove erroneus "Conflicts: perf" which broke perf. + * Mon Apr 19 2021 Zamir SUN - 1.2.1-1 - Update to 1.2.1