From 107ff53fd494efa95df0a728fca8613c57848dcb Mon Sep 17 00:00:00 2001 From: cherry530 <707078654@qq.com> Date: Mon, 16 Dec 2024 17:05:16 +0800 Subject: [PATCH] add conflict perf version Signed-off-by: cherry530 <707078654@qq.com> (cherry picked from commit 5a23400400db00b487eacb34909b40baf406e073) --- libtraceevent.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libtraceevent.spec b/libtraceevent.spec index 4a677d5..da0471b 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -1,6 +1,6 @@ Name: libtraceevent Version: 1.2.1 -Release: 3 +Release: 4 License: LGPLv2+ and GPLv2+ Summary: Library to parse raw trace event formats @@ -13,7 +13,7 @@ BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc -Conflicts: perf +Conflicts: perf < 6.2.0 %global __provides_exclude_from ^%{_libdir}/traceevent/plugins @@ -56,6 +56,9 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/pkgconfig/libtraceevent.pc %changelog +* Mon Dec 16 2024 xu_ping <707078654@qq.com.com> - 1.2.1-4 +- add conflict perf version. + * Thu Jan 19 2023 yaoxin - 1.2.1-3 - Add conflict with perf -- Gitee