diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-17 16:49:31 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-17 16:49:31 -0500 |
| commit | b177d8142b55829428cfbe0ca3cbf1469bd04423 (patch) | |
| tree | e2103e46e6e9fa3793855922be6947fb68292a1a | |
| parent | f7d030489d2980c9deb733925515099ec256f6d2 (diff) | |
| download | mariadb-git-b177d8142b55829428cfbe0ca3cbf1469bd04423.tar.gz | |
MDEV-10954: sles11 does not have 'which' package (post-fix)bb-10.1-nirbhay
| -rw-r--r-- | cmake/cpack_rpm.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index f1aab2c353c..8c59fbcb827 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -158,9 +158,14 @@ SETA(CPACK_RPM_server_PACKAGE_REQUIRES "MariaDB-client") IF(WITH_WSREP) -SETA(CPACK_RPM_server_PACKAGE_REQUIRES - "galera" "rsync" "lsof" "grep" "gawk" "iproute" - "coreutils" "findutils" "tar" "which") + SETA(CPACK_RPM_server_PACKAGE_REQUIRES + "galera" "rsync" "lsof" "grep" "gawk" "iproute" + "coreutils" "findutils" "tar") + IF (RPM MATCHES "sles11") + SETA(CPACK_RPM_server_PACKAGE_REQUIRES "util") + ELSE() + SETA(CPACK_RPM_server_PACKAGE_REQUIRES "which") + ENDIF() ENDIF() SET(CPACK_RPM_server_PRE_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-prein.sh) |