diff --git a/SPECS/libtracefs.spec b/SPECS/libtracefs.spec index 8d5d61d..08adad5 100644 --- a/SPECS/libtracefs.spec +++ b/SPECS/libtracefs.spec @@ -11,7 +11,7 @@ Name: libtracefs Version: 1.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ and GPLv2+ Summary: Library for access kernel tracefs @@ -27,8 +27,6 @@ Patch0: libtracefs-1.0.2-harden-linking.patch 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 < 2.9.1-6 %description libtracefs is a library for accessing kernel tracefs @@ -67,6 +65,10 @@ rm -rf %{buildroot}/%{_libdir}/libtracefs.a %{_libdir}/%{name}.so %changelog +* Thu Feb 2 2023 Michael Petlan - 1.3.1-2 +- Remove conflict with trace-cmd + Related: rhbz#2159965 + * Mon Nov 23 2020 Zamir SUN - 1.3.1-1 - Initial libtracefs Related: rhbz#2075198