From 1bed7cc0b5904f36d49f486decf608445cd6cc7e Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
Date: Thu, 8 Apr 2021 17:30:04 +1000
Subject: MDEV-25280: cpack_rpm - MariaDB-client file moves

This fixes the MariaDB-client RPM to conflict with
< MariaDB-server-10.6 as a number of files where moved
from the server to client component.

see commits 09202b2e6db0f2308c5c669322b057ac7f100378 ->
 fa0ad2fb11859fdeec93bbf3c4a6fc418eb372ac
---
 cmake/cpack_rpm.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 873a75fb9e5..69688833c41 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -152,6 +152,8 @@ SETA(CPACK_RPM_client_PACKAGE_OBSOLETES
 SETA(CPACK_RPM_client_PACKAGE_PROVIDES
   "MySQL-client"
   "mysql-client")
+SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
+  "MariaDB-server < 10.6.0")
 
 SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
   "MySQL-devel")
-- 
cgit v1.2.1