From aa9a158ed525037f7cccc0427913c11cb94df5f5 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 9 Feb 2017 15:29:44 +0000 Subject: [PATCH] MCOL-105 - add suse boost-devel package check --- cpackEngineRPM.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake index e284458a3..b427afbfc 100644 --- a/cpackEngineRPM.cmake +++ b/cpackEngineRPM.cmake @@ -81,13 +81,18 @@ IF (EXISTS "/etc/redhat-release") set(REDHAT_VERSION_NUMBER "${CMAKE_MATCH_1}") ENDIF () if (${REDHAT_VERSION_NUMBER} EQUAL 6) - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs" "snappy") + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs") # Disable auto require as this will also try to pull Boost via RPM SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no") else () - SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs" "snappy") + if (${REDHAT_VERSION_NUMBER} EQUAL 7) + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs") + else () + SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel" "mariadb-columnstore-libs") + endif() endif() + SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "mariadb-columnstore-libs") SET(CPACK_RPM_platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh) @@ -291,6 +296,9 @@ SET(CPACK_RPM_libs_USER_FILELIST "/usr/local/mariadb/columnstore/lib/libbatchloader.so.1.0.0" "/usr/local/mariadb/columnstore/lib/libbatchloader.so.1" "/usr/local/mariadb/columnstore/lib/libbatchloader.so" +"/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1.0.0" +"/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so.1" +"/usr/local/mariadb/columnstore/lib/libmysqlcl_idb.so" "/usr/local/mariadb/columnstore/lib/libquerystats.so.1.0.0" "/usr/local/mariadb/columnstore/lib/libquerystats.so.1" "/usr/local/mariadb/columnstore/lib/libquerystats.so"