diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-22 18:31:04 -0400 |
| commit | ab4947463e68da1a01bd506f8f280ebdea3f1b46 (patch) | |
| tree | 75ec757acf0955e19d1fac0f3fcac2a6593e0a2f /cmake/cpack_rpm.cmake | |
| parent | 0bf3ed12a5338f0db4b652f839fee93a28d39195 (diff) | |
| download | mariadb-git-ab4947463e68da1a01bd506f8f280ebdea3f1b46.tar.gz | |
Merging changes from maria-5.5-galera and
some test fixes.
bzr merge -r3479..3493 maria-5.5-galera
Diffstat (limited to 'cmake/cpack_rpm.cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 5 |
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} |