From 3e3ff161fc607dc2709096b72837b1cd4e6c8010 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Thu, 19 Jan 2023 16:35:10 +0800 Subject: [PATCH] Add conflict with perf (cherry picked from commit ee3b9be8482ea0c92100f4016440e7fbc8835c32) --- libtraceevent.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libtraceevent.spec b/libtraceevent.spec index 710d7df..4a677d5 100644 --- a/libtraceevent.spec +++ b/libtraceevent.spec @@ -1,6 +1,6 @@ Name: libtraceevent Version: 1.2.1 -Release: 2 +Release: 3 License: LGPLv2+ and GPLv2+ Summary: Library to parse raw trace event formats @@ -13,6 +13,8 @@ BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc +Conflicts: perf + %global __provides_exclude_from ^%{_libdir}/traceevent/plugins %description @@ -54,6 +56,9 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a %{_libdir}/pkgconfig/libtraceevent.pc %changelog +* Thu Jan 19 2023 yaoxin - 1.2.1-3 +- Add conflict with perf + * Mon Dec 05 2022 xu_ping - 1.2.1-2 - Add -fstack-protector-strong compile options -- Gitee