From efdf6e65b984ebe07ad69d3d5463cf445098f9e6 Mon Sep 17 00:00:00 2001 From: David Hill Date: Thu, 9 Feb 2017 16:05:56 -0600 Subject: [PATCH] MCOL-105 - change suse boost-devel package check, add back in 1.1 changes --- cpackEngineRPM.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake index e5030c4fb..403b285e7 100644 --- a/cpackEngineRPM.cmake +++ b/cpackEngineRPM.cmake @@ -73,7 +73,8 @@ SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "mariadb-columnstore-libs") SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "mariadb-columnstore-platform") SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine") -# Boost is a source build in CentOS 6 so don't require it as a package + +ost is a source build in CentOS 6 so don't require it as a package SET(REDHAT_VERSION_NUMBER OFF) SET(SUSE_VERSION_NUMBER OFF) IF (EXISTS "/etc/redhat-release") @@ -299,9 +300,6 @@ 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"