From 39ab203912f546eb3c8d94e5604c31dc0a65edca Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Wed, 24 Mar 2021 18:45:10 +0100 Subject: [PATCH] Remove conflict for latest trace-cmd --- libtracefs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libtracefs.spec b/libtracefs.spec index d12ae6e..927211b 100644 --- a/libtracefs.spec +++ b/libtracefs.spec @@ -11,7 +11,7 @@ Name: libtracefs Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ Summary: Library for access kernel tracefs @@ -27,7 +27,7 @@ BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(libtraceevent) # The libtracefs 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: trace-cmd +Conflicts: trace-cmd < 2.9.1-6 %description libtracefs is a library for accessing kernel tracefs @@ -62,6 +62,9 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a %{_libdir}/%{name}.so %changelog +* Wed Mar 24 2021 Jerome Marchand - 1.0.2-2 +- Remove conflict for latest trace-cmd + * Mon Feb 08 2021 Zamir SUN - 1.0.2-1 - Update to 1.0.2