From 0c7d2a5acdcbd4c0d3778e811f04d3a1de33601c Mon Sep 17 00:00:00 2001 From: xiexing Date: Wed, 20 Dec 2023 03:20:30 +0000 Subject: [PATCH 1/2] update redis6.spec. Signed-off-by: xiexing --- redis6.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/redis6.spec b/redis6.spec index 83de92a..f8565ed 100644 --- a/redis6.spec +++ b/redis6.spec @@ -40,6 +40,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 @@ -63,6 +64,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. @@ -71,7 +73,7 @@ API documentation is available in the redis-doc package. Summary: Documentation for Redis License: CC-BY-SA BuildArch: noarch -Conflicts: redis < 5.0 +Conflicts: redis redis5 %description doc Detailed documentation for many aspects of Redis use, administration and development. @@ -214,8 +216,8 @@ fi %{_docdir}/%{Pname} %changelog -* Mon Dec 18 2023 xiexing - 6.2.7-3 -- Update Conflicts form 4.0 to 5.0 +* Wed Dec 20 2023 xiexing - 6.2.7-3 +- add Conflicts with 4.0 and 5.0 * Tue Dec 27 2022 Ge Wang - 6.2.7-2 - Update config.guess and config.sub for loongarch64 architecture -- Gitee From 51c75866a35b7aa111f1b83113200c5be6a0b45e Mon Sep 17 00:00:00 2001 From: xiexing Date: Thu, 21 Dec 2023 01:56:17 +0000 Subject: [PATCH 2/2] update redis6.spec. Signed-off-by: xiexing --- redis6.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redis6.spec b/redis6.spec index f8565ed..62bf6d4 100644 --- a/redis6.spec +++ b/redis6.spec @@ -217,7 +217,7 @@ fi %changelog * Wed Dec 20 2023 xiexing - 6.2.7-3 -- add Conflicts with 4.0 and 5.0 +- add Conflicts with redis and redis5 * Tue Dec 27 2022 Ge Wang - 6.2.7-2 - Update config.guess and config.sub for loongarch64 architecture -- Gitee