!67 add conflicts with reid and redis5

From: @xiexing01 
Reviewed-by: @macchen1 
Signed-off-by: @macchen1
This commit is contained in:
xiexing 2023-12-21 08:17:58 +00:00 committed by openeuler-ci-bot
parent 84ed6be886
commit c3db31d755

View File

@ -6,7 +6,7 @@
%global Pname redis %global Pname redis
Name: redis6 Name: redis6
Version: 6.2.7 Version: 6.2.7
Release: 1 Release: 2
Summary: A persistent key-value database Summary: A persistent key-value database
License: BSD and MIT License: BSD and MIT
URL: https://redis.io URL: https://redis.io
@ -39,6 +39,7 @@ Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
Provides: redis(modules_abi)%{?_isa} = 1 Provides: redis(modules_abi)%{?_isa} = 1
Conflicts: redis redis5
%description %description
Redis is an advanced key-value store. It is often referred to as a data Redis is an advanced key-value store. It is often referred to as a data
structure server since keys can contain strings, hashes, lists, sets and structure server since keys can contain strings, hashes, lists, sets and
@ -62,6 +63,7 @@ You can use Redis from most programming languages also.
%package devel %package devel
Summary: Development header for Redis module development Summary: Development header for Redis module development
Provides: %{Pname}-static = %{version}-%{release} Provides: %{Pname}-static = %{version}-%{release}
Conflicts: redis redis5
%description devel %description devel
Header file required for building loadable Redis modules. Detailed Header file required for building loadable Redis modules. Detailed
API documentation is available in the redis-doc package. API documentation is available in the redis-doc package.
@ -70,7 +72,7 @@ API documentation is available in the redis-doc package.
Summary: Documentation for Redis Summary: Documentation for Redis
License: CC-BY-SA License: CC-BY-SA
BuildArch: noarch BuildArch: noarch
Conflicts: redis < 4.0 Conflicts: redis redis5
%description doc %description doc
Detailed documentation for many aspects of Redis use, Detailed documentation for many aspects of Redis use,
administration and development. administration and development.
@ -210,6 +212,9 @@ fi
%{_docdir}/%{Pname} %{_docdir}/%{Pname}
%changelog %changelog
* Wed Dec 20 2023 xiexing <xiexing4@h-partners.com> - 6.2.7-2
- add Conflicts with redis and redis5
* Tue Jun 14 2022 yangweidong <yangweidong9@huawei.com> - 6.2.7-1 * Tue Jun 14 2022 yangweidong <yangweidong9@huawei.com> - 6.2.7-1
- Fix CVE-2022-24735 CVE-2022-24736 CVE-2021-29477 CVE-2021-32672 - Fix CVE-2022-24735 CVE-2022-24736 CVE-2021-29477 CVE-2021-32672