diff --git a/protobuf.spec b/protobuf.spec index 94392b2c5b6191abcebda3fd5a289f5843b3102d..1651420edb91caa6ec0792075ebd745a744ffd91 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -15,7 +15,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 25.1 -Release: 12 +Release: 13 License: BSD-3-Clause URL: https://github.com/protocolbuffers/protobuf Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz @@ -46,6 +46,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 @@ -399,6 +400,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Aug 27 2025 songliyang - 25.1-13 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: obsolets protobuf2-emacs to fix install conflict + * Thu June 26 2025 zhongtao - 25.1-12 - Type:bugfix - ID:NA