diff --git a/protobuf.spec b/protobuf.spec index 500ec5dc0f91ed0d107f74deed506c0e83d37ca6..b8c6d4463f7be2291b4762cfa5ccf60ea2f11e0a 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: 9 +Release: 10 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 @@ -37,6 +37,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 @@ -333,6 +334,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Aug 27 2025 songliyang - 3.14.0-10 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: obsolets protobuf2-emacs to fix install conflict + * Fri June 27 2025 zhongtao - 3.14.0-9 - Type:bugfix - ID:NA