From 8a62986047076900113e6bfc0cb1d21a04c73cd0 Mon Sep 17 00:00:00 2001 From: songliyang Date: Wed, 27 Aug 2025 15:50:26 +0800 Subject: [PATCH] Obsoletes protobuf2-emacs to fix install conflict --- protobuf.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/protobuf.spec b/protobuf.spec index 165c176..81ee211 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -7,7 +7,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 11 +Release: 12 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 @@ -38,6 +38,7 @@ Requires: %{name} = %{version}-%{release} Obsoletes: protobuf-emacs < %{version} Obsoletes: protobuf-emacs-el < %{version} Obsoletes: protobuf2-compiler +Obsoletes: protobuf2-emacs Requires: emacs-filesystem >= %{_emacs_version} %description compiler @@ -403,6 +404,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Aug 27 2025 songliyang - 25.1-12 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: obsolets protobuf2-emacs to fix install conflict + * Thu Jul 03 2025 wujichao - 25.1-11 - Type:bugfix - ID:NA -- Gitee