From 4e50c3434ad795cc2891d491d5aa48e9eb87b231 Mon Sep 17 00:00:00 2001
From: lyn1001 <thistleslyn@163.com>
Date: Thu, 13 Jul 2023 14:58:34 +0800
Subject: [PATCH] Delete confilt with perf when the kernel is greater than 6.2

---
 libtraceevent.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libtraceevent.spec b/libtraceevent.spec
index 4a677d5..e261de3 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,8 +13,6 @@ BuildRequires: 	gcc
 BuildRequires: 	xmlto
 BuildRequires: 	asciidoc
 
-Conflicts:      perf
-
 %global __provides_exclude_from ^%{_libdir}/traceevent/plugins
 
 %description
@@ -56,6 +54,9 @@ rm -rf %{buildroot}/%{_libdir}/libtraceevent.a
 %{_libdir}/pkgconfig/libtraceevent.pc
 
 %changelog
+* Thu Jul 13 2023 liyanan <thistleslyn@163.com> - 1.2.1-4
+- Delete confilt with perf when the kernel is greater than 6.2
+
 * Thu Jan 19 2023 yaoxin <yaoxin30@h-partners.com> - 1.2.1-3
 - Add conflict with perf
 
-- 
Gitee