diff --git a/protobuf2.spec b/protobuf2.spec index 9ec6fcb53c825ccf59330e2a66844ca5d8386f1d..6e452171d7ed4488864e6dec784ac04b7dd48b49 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 @@ -43,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 @@ -241,6 +243,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