diff --git a/redis6.spec b/redis6.spec index 83de92a67a8ad5728d62bb69a487b4ca68c12fe6..62bf6d46e8f87880c5980357ffd1d3349e3c4945 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 redis and redis5 * Tue Dec 27 2022 Ge Wang - 6.2.7-2 - Update config.guess and config.sub for loongarch64 architecture