From 6b609e6589a1013d26b24a75a63e4d5825b5fcd7 Mon Sep 17 00:00:00 2001 From: konglidong Date: Wed, 6 Dec 2023 11:27:11 +0800 Subject: [PATCH] obsolets protobuf2 for fix install conflict --- protobuf.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/protobuf.spec b/protobuf.spec index 3bd0bf9..47e6602 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -8,7 +8,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 3.19.6 -Release: 1 +Release: 2 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 @@ -31,6 +31,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 @@ -46,6 +47,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 @@ -68,6 +72,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 @@ -325,6 +331,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Dec 06 2023 konglidong - 3.19.6-2 +- obsolets protobuf2 for fix install conflict + * Mon Jul 17 2023 zhongtao - 3.19.6-1 - update to 3.19.6 -- Gitee