summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-12-14 18:12:15 +1100
committerSergei Golubchik <serg@mariadb.org>2023-02-12 12:15:22 +0100
commit36ea5dffe708237cc1f714feda805cc203fe6d41 (patch)
tree0125cb185d39f4b02587ebd5226113edc0b03e6f /cmake
parentc6f08144682a1760808b501730904d4f662e9120 (diff)
downloadmariadb-git-36ea5dffe708237cc1f714feda805cc203fe6d41.tar.gz
resolve-stack-dump was moved from server to client (RPM)
like where the man page and Debian package put it.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index a2c2f160963..f757c715c66 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -184,7 +184,7 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES
"mysql-client"
"mytop")
SETA(CPACK_RPM_client_PACKAGE_CONFLICTS
- "MariaDB-server < 10.6.0")
+ "MariaDB-server < 11.0.0")
SETA(CPACK_RPM_common_PACKAGE_CONFLICTS
"MariaDB-server < 10.6.1")
@@ -216,7 +216,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
"MariaDB-common >= 10.6.1"
- "MariaDB-client >= 10.6.1")
+ "MariaDB-client >= 11.0.0")
IF(WITH_WSREP)
SETA(CPACK_RPM_server_PACKAGE_REQUIRES