summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/cpack_rpm.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 19a4b484538..454e008363f 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -157,6 +157,9 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES
SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
"MariaDB-server < 10.6.0")
+SETA(CPACK_RPM_common_PACKAGE_CONFLICTS
+ "MariaDB-server < 10.6.1")
+
SETA(CPACK_RPM_devel_PACKAGE_OBSOLETES
"MySQL-devel")
SETA(CPACK_RPM_devel_PACKAGE_PROVIDES
@@ -181,7 +184,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
"MySQL-test")
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
- "${CPACK_RPM_PACKAGE_REQUIRES}"
+ "MariaDB-common >= 10.6.1"
"MariaDB-client")
IF(WITH_WSREP)