From 0e81cfc796781736ca9872c6d0a207271ec1e028 Mon Sep 17 00:00:00 2001 From: jxy_git Date: Thu, 20 Jun 2024 13:53:05 +0800 Subject: [PATCH] add Conflicts with redis and redis5 --- redis6.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/redis6.spec b/redis6.spec index 7ed9110..62bf6d4 100644 --- a/redis6.spec +++ b/redis6.spec @@ -6,7 +6,7 @@ %global Pname redis Name: redis6 Version: 6.2.7 -Release: 2 +Release: 3 Summary: A persistent key-value database License: BSD and MIT URL: https://redis.io @@ -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 < 4.0 +Conflicts: redis redis5 %description doc Detailed documentation for many aspects of Redis use, administration and development. @@ -214,6 +216,9 @@ fi %{_docdir}/%{Pname} %changelog +* Wed Dec 20 2023 xiexing - 6.2.7-3 +- 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