summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-05-12 12:45:02 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-05-12 12:45:02 -0400
commit50d1e45cd49f39231ea9cc87f7c4a17f1617fc2f (patch)
tree8cc414bdc6f8659d21d9487bce79420ca6a18aa8 /cmake
parent00b6fff2e7bedad1ecd270d9e86f991bed29482c (diff)
downloadmariadb-git-50d1e45cd49f39231ea9cc87f7c4a17f1617fc2f.tar.gz
MDEV#5925: New mariadb-galera-test packages
Added logic for generation of 'galera' test packages.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 1d373106d8d..9738de452b1 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -23,8 +23,7 @@ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
SET(CPACK_COMPONENT_COMMON_GROUP "common")
SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
- SupportFiles Readme)
-
+ SupportFiles Readme Test)
SET(CPACK_RPM_PACKAGE_NAME "MariaDB-Galera")
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
@@ -147,6 +146,8 @@ SETA(CPACK_RPM_test_PACKAGE_OBSOLETES
"MySQL-OurDelta-test")
SETA(CPACK_RPM_test_PACKAGE_PROVIDES
"MySQL-test")
+SET(CPACK_RPM_test_PACKAGE_CONFLICTS
+ "MariaDB-test")
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
${CPACK_RPM_PACKAGE_REQUIRES}