From c3db31d7553452f34db5be982a8ba6269c6ff5d6 Mon Sep 17 00:00:00 2001 From: xiexing Date: Thu, 21 Dec 2023 08:17:58 +0000 Subject: [PATCH] !67 add conflicts with reid and redis5 From: @xiexing01 Reviewed-by: @macchen1 Signed-off-by: @macchen1 --- redis6.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/redis6.spec b/redis6.spec index 1338dad..1790ac8 100644 --- a/redis6.spec +++ b/redis6.spec @@ -6,7 +6,7 @@ %global Pname redis Name: redis6 Version: 6.2.7 -Release: 1 +Release: 2 Summary: A persistent key-value database License: BSD and MIT URL: https://redis.io @@ -39,6 +39,7 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Provides: redis(modules_abi)%{?_isa} = 1 +Conflicts: redis redis5 %description 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 @@ -62,6 +63,7 @@ You can use Redis from most programming languages also. %package devel Summary: Development header for Redis module development Provides: %{Pname}-static = %{version}-%{release} +Conflicts: redis redis5 %description devel Header file required for building loadable Redis modules. Detailed 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 License: CC-BY-SA BuildArch: noarch -Conflicts: redis < 4.0 +Conflicts: redis redis5 %description doc Detailed documentation for many aspects of Redis use, administration and development. @@ -210,6 +212,9 @@ fi %{_docdir}/%{Pname} %changelog +* Wed Dec 20 2023 xiexing - 6.2.7-2 +- add Conflicts with redis and redis5 + * Tue Jun 14 2022 yangweidong - 6.2.7-1 - Fix CVE-2022-24735 CVE-2022-24736 CVE-2021-29477 CVE-2021-32672