!99 obsolets protobuf2 for fix install conflict

From: @konglidong 
Reviewed-by: @taotao-sauce, @duguhaotian 
Signed-off-by: @duguhaotian
This commit is contained in:
openeuler-ci-bot 2023-12-08 06:54:07 +00:00 committed by Gitee
commit 96fdd9f571
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -8,7 +8,7 @@
Summary: Protocol Buffers - Google's data interchange format Summary: Protocol Buffers - Google's data interchange format
Name: protobuf Name: protobuf
Version: 3.19.6 Version: 3.19.6
Release: 1 Release: 2
License: BSD License: BSD
URL: https://github.com/protocolbuffers/protobuf URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz
@ -31,6 +31,7 @@ Summary: Protocol Buffers compiler
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: protobuf-emacs < %{version} Obsoletes: protobuf-emacs < %{version}
Obsoletes: protobuf-emacs-el < %{version} Obsoletes: protobuf-emacs-el < %{version}
Obsoletes: protobuf2-compiler
Requires: emacs-filesystem >= %{_emacs_version} Requires: emacs-filesystem >= %{_emacs_version}
%description compiler %description compiler
@ -46,6 +47,9 @@ Provides: %{name}-static
Provides: %{name}-vim Provides: %{name}-vim
Obsoletes: %{name}-static < %{version} Obsoletes: %{name}-static < %{version}
Obsoletes: %{name}-vim < %{version} Obsoletes: %{name}-vim < %{version}
Obsoletes: protobuf2-devel
Obsoletes: protobuf2-vim
Obsoletes: protobuf2-static
%description devel %description devel
@ -68,6 +72,8 @@ Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-lite = %{version}-%{release} Requires: %{name}-lite = %{version}-%{release}
Provides: %{name}-lite-static Provides: %{name}-lite-static
Obsoletes: %{name}-lite-static < %{version} Obsoletes: %{name}-lite-static < %{version}
Obsoletes: protobuf2-lite-devel
Obsoletes: protobuf2-lite-static
%description lite-devel %description lite-devel
This package contains development libraries built with This package contains development libraries built with
@ -325,6 +331,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
%endif %endif
%changelog %changelog
* Wed Dec 06 2023 konglidong <konglidong@uniontech.com> - 3.19.6-2
- obsolets protobuf2 for fix install conflict
* Mon Jul 17 2023 zhongtao <zhongtao17@huawei.com> - 3.19.6-1 * Mon Jul 17 2023 zhongtao <zhongtao17@huawei.com> - 3.19.6-1
- update to 3.19.6 - update to 3.19.6