diff --git a/libtraceevent.spec b/libtraceevent.spec index 29b831c..ab7aac4 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -5,7 +5,7 @@ Name: libtraceevent Version: 1.1.1 -Release: 3%{?dist} +Release: 4%{?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 +* Thu May 6 2021 Michael Petlan - 1.1.1-4 +- Remove conflict to enable perf linking. Resolves: rhbz#1957733 + * Wed Apr 21 2021 Jerome Marchand - 1.1.1-3 - Multi-build with libtracefs, trace-cmd and kernelshark