From 23836e1b36b3bf5e97ad380ea4e966123ba28ff9 Mon Sep 17 00:00:00 2001 From: Weijian Wen Date: Tue, 12 Dec 2023 15:30:58 +0800 Subject: [PATCH 1/2] add conflict protobuf-compile (cherry picked from commit 943a289a7ed14faf35711ab775f7afbf4a336c38) --- protobuf2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/protobuf2.spec b/protobuf2.spec index 9ec6fcb..d9eec23 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: 3 +Release: 4 License: BSD Source: http://protobuf.googlecode.com/files/protobuf-%{version}.tar.bz2 Source1: ftdetect-proto.vim @@ -35,6 +35,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 @@ -241,6 +242,9 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} %endif %changelog +* Tue Dec 12 2023 wenweijian - 2.5.0-4 +- Add conflict protobuf-compiler + * Wed Aug 18 2021 lingsheng - 2.5.0-3 - Modify subpackage's install require -- Gitee From 5fcadfdd0a9872c7c72b7d5e543c191eff184d2c Mon Sep 17 00:00:00 2001 From: Weijian Wen Date: Tue, 12 Dec 2023 15:38:44 +0800 Subject: [PATCH 2/2] add conflict protobuf-devel (cherry picked from commit 79968fa830dcbead5f120ab41369224a2b6b1101) --- protobuf2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/protobuf2.spec b/protobuf2.spec index d9eec23..6e45217 100644 --- a/protobuf2.spec +++ b/protobuf2.spec @@ -44,6 +44,7 @@ languages Summary: Protocol Buffers C++ headers and libraries Requires: %{name} = %{version}-%{release} %{name}-compiler = %{version}-%{release} Requires: zlib-devel pkgconfig +Conflicts: protobuf-devel %description devel This package contains Protocol Buffers compiler for all languages and C++ headers and libraries -- Gitee