From e094531d6d023e85e053239c6d7aebbce36f4a6b Mon Sep 17 00:00:00 2001
From: Weijian Wen <wenweijian2@huawei.com>
Date: Tue, 12 Dec 2023 15:20:48 +0800
Subject: [PATCH] add conflict protobuf-compile

---
 protobuf2.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/protobuf2.spec b/protobuf2.spec
index c318cef..82d1f7a 100644
--- a/protobuf2.spec
+++ b/protobuf2.spec
@@ -6,7 +6,7 @@
 Summary:             Protocol Buffers - Google's data interchange format
 Name:                protobuf2
 Version:             2.5.0
-Release:             5
+Release:             6
 License:             BSD
 Source:              http://protobuf.googlecode.com/files/protobuf-%{version}.tar.bz2
 Source1:             ftdetect-proto.vim
@@ -37,6 +37,7 @@ breaking deployed programs that are compiled against the "old" format.
 %package compiler
 Summary:             Protocol Buffers compiler
 Requires:            %{name} = %{version}-%{release}
+Conflicts:           protobuf-compiler
 %description compiler
 This package contains Protocol Buffers compiler for all programming
 languages
@@ -249,6 +250,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir}
 %endif
 
 %changelog
+* Tue Dec 12 2023 wenweijian <wenweijian2@huawei.com> - 2.5.0-6
+- add conflict protobuf-compiler
+
 * Mon Jul 17 2023 zhangxiang <zhangxiang@iscas.ac.cn> - 2.5.0-5
 - add riscv64 support
 
-- 
Gitee