summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-05-25 00:07:25 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-05-25 00:07:25 -0400
commit0f10b12b1c819e0653970ee8990d663cd9246179 (patch)
tree4b98bba209221c2f1323db03f9779dc7d53db7e6 /cmake
parent50d1e45cd49f39231ea9cc87f7c4a17f1617fc2f (diff)
downloadmariadb-git-0f10b12b1c819e0653970ee8990d663cd9246179.tar.gz
MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' is
not in the dependency list Added socat, grep, gawk, iproute, coreutils, findutils to the dependency list.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake7
1 files changed, 2 insertions, 5 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 9738de452b1..11f681d8e6e 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -126,7 +126,8 @@ SETA(CPACK_RPM_server_PACKAGE_PROVIDES
"mysql-server")
SETA(CPACK_RPM_server_PACKAGE_REQUIRES
"${CPACK_RPM_PACKAGE_REQUIRES}"
- "galera")
+ "MariaDB-client" "galera" "lsof" "socat" "grep" "gawk" "iproute" "coreutils"
+ "findutils")
SETA(CPACK_RPM_shared_PACKAGE_OBSOLETES
"mysql-shared"
@@ -149,10 +150,6 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES
SET(CPACK_RPM_test_PACKAGE_CONFLICTS
"MariaDB-test")
-SETA(CPACK_RPM_server_PACKAGE_REQUIRES
- ${CPACK_RPM_PACKAGE_REQUIRES}
- "MariaDB-client")
-
SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh)
SET(CPACK_RPM_server_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-preun.sh)
SET(CPACK_RPM_server_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-postin.sh)