diff --git a/protobuf.spec b/protobuf.spec index 165c17608b61afa2b7391da933d04d999a6c8678..81ee211c5e047ef715c59a0a66964a0db5424826 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