diff --git a/protobuf.spec b/protobuf.spec index 26dac293b21bbf75c4cb636c3a6aef028e323553..c6d43369a2675cb497911029e2d8f13fcced0aaf 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -8,7 +8,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 3.14.0 -Release: 7 +Release: 8 License: BSD URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz @@ -35,6 +35,7 @@ Summary: Protocol Buffers compiler Requires: %{name} = %{version}-%{release} Obsoletes: protobuf-emacs < %{version} Obsoletes: protobuf-emacs-el < %{version} +Obsoletes: protobuf2-compiler Requires: emacs-filesystem >= %{_emacs_version} %description compiler @@ -50,6 +51,9 @@ Provides: %{name}-static Provides: %{name}-vim Obsoletes: %{name}-static < %{version} Obsoletes: %{name}-vim < %{version} +Obsoletes: protobuf2-devel +Obsoletes: protobuf2-vim +Obsoletes: protobuf2-static %description devel @@ -72,6 +76,8 @@ Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-lite = %{version}-%{release} Provides: %{name}-lite-static Obsoletes: %{name}-lite-static < %{version} +Obsoletes: protobuf2-lite-devel +Obsoletes: protobuf2-lite-static %description lite-devel This package contains development libraries built with @@ -326,6 +332,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Dec 06 2023 konglidong - 3.14.0-8 +- obsolets protobuf2 for fix install conflict + * Mon Nov 21 2022 chengzeruizhi - 3.14.0-7 - Type:enhancement - ID:NA