diff --git a/protobuf.spec b/protobuf.spec index 7cd696be77e969dae36b3440ab8f8eefb3d3c5f1..5d268fd19569c233c189561223d6b2cdbc6818f4 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: 8 +Release: 9 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 @@ -36,6 +36,8 @@ Summary: Protocol Buffers compiler 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 @@ -51,6 +53,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 @@ -73,6 +78,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 @@ -327,6 +334,12 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir} %endif %changelog +* Wed Aug 27 2025 songliyang - 3.14.0-9 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: obsolets protobuf2 to fix install conflict + * Thu Jul 03 2025 wujichao - 3.14.0-8 - Type:bugfix - ID:NA