From d4f4d7a3150b61e01ffe7af647a24d95b6839f73 Mon Sep 17 00:00:00 2001
From: david hill <david.hill@mariadb.com>
Date: Wed, 7 Feb 2018 14:45:17 -0600
Subject: [PATCH] MCOL-927

---
 cpackEngineRPM.cmake             | 2 +-
 oam/install_scripts/post-install | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cpackEngineRPM.cmake b/cpackEngineRPM.cmake
index 5c340adfc..3bb247dfa 100644
--- a/cpackEngineRPM.cmake
+++ b/cpackEngineRPM.cmake
@@ -87,7 +87,7 @@ IF (EXISTS "/etc/SuSE-release")
     set(SUSE_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" "mariadb-columnstore-storage-engine "snappy")
     # Disable auto require as this will also try to pull Boost via RPM
     SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
 elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install
index fc60e32e7..585d1b8b0 100755
--- a/oam/install_scripts/post-install
+++ b/oam/install_scripts/post-install
@@ -276,8 +276,11 @@ fi
 
 #log install message
 test -f $installdir/post/functions && . $installdir/post/functions
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
-
+if [ $user = "root" ]; then
+	$installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
+else
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$installdir/lib $installdir/bin/cplogger -i 19 "***** MariaDB Columnstore Installed *****"
+fi
 #setup hadoop
 hadoop=`which hadoop 2>/dev/null`
 if [ -z "$hadoop" ]; then