Updated mantidlibs scl to be mantidlibs34

Also removed need for performing scl enable on RHEL7

Code/Mantid/Build/CMake/LinuxPackageScripts.cmake

@@ -82,9 +82,8 @@ set ( PRE_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/prerm )
 set ( POST_UNINSTALL_FILE ${CMAKE_CURRENT_BINARY_DIR}/postrm )
 
 if ( "${UNIX_DIST}" MATCHES "RedHatEnterprise" OR "${UNIX_DIST}" MATCHES "^Fedora" ) # RHEL/Fedora
-  if ( "${UNIX_CODENAME}" MATCHES "Santiago" OR
-       "${UNIX_CODENAME}" MATCHES "Maipo" )
-    set ( WRAPPER_PREFIX "scl enable mantidlibs \"" )
+  if ( "${UNIX_CODENAME}" MATCHES "Santiago" )
+    set ( WRAPPER_PREFIX "scl enable mantidlibs34 \"" )
     set ( WRAPPER_POSTFIX "\"" )
   else()
     set ( WRAPPER_PREFIX "" )

Code/Mantid/Build/Jenkins/buildscript

@@ -124,7 +124,7 @@ fi
 # RHEL6 setup steps - nodes must have a "rhel6" label set (in lowercase)
 ###############################################################################
 if [[ ${NODE_LABELS} == *rhel6* ]]; then
-  SCL_ON_RHEL6="scl enable mantidlibs"
+  SCL_ON_RHEL6="scl enable mantidlibs34"
   ON_RHEL6=true
 else
   SCL_ON_RHEL6="eval"
@@ -176,7 +176,7 @@ $SCL_ON_RHEL6 "cmake -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} -DENABLE_CPACK=ON -DMAKE
 # Coverity build should exit early
 ###############################################################################
 if [[ ${JOB_NAME} == *coverity_build_and_submit* ]]; then
-  ${COVERITY_DIR}/cov-build --dir cov-int scl enable mantidlibs "make -j${BUILD_THREADS}"
+  ${COVERITY_DIR}/cov-build --dir cov-int scl enable mantidlibs34 "make -j${BUILD_THREADS}"
   tar czvf mantid.tgz cov-int
   status=$(curl --form token=$COVERITY_TOKEN --form email=mantidproject@gmail.com \
        --form file=@mantid.tgz --form version=$GIT_COMMIT \

Code/Mantid/Build/Jenkins/systemtests

@@ -28,7 +28,7 @@ fi
 # RHEL6 setup steps - nodes must have a "rhel6" label set (in lowercase)
 ###############################################################################
 if [[ ${NODE_LABELS} == *rhel6* ]]; then
-  SCL_ON_RHEL6="scl enable mantidlibs"
+  SCL_ON_RHEL6="scl enable mantidlibs34"
   ON_RHEL6=true
 else
   SCL_ON_RHEL6="eval"

Code/Mantid/Build/dev-packages/rpm/mantid-developer/mantid-developer.spec

@@ -57,8 +57,8 @@ Requires: texlive-was
 Requires: tex-preview
 Requires: dvipng
 %if 0%{?el6}
-Requires: mantidlibs-qt-devel
-Requires: mantidlibs-qtwebkit-devel
+Requires: mantidlibs34-qt-devel
+Requires: mantidlibs34-qtwebkit-devel
 Requires: scl-utils
 %else
 Requires: qt-devel

Code/Mantid/CMakeLists.txt

@@ -239,7 +239,7 @@ if ( ENABLE_CPACK )
         # On RHEL6 we have to use an updated qscintilla to fix an auto complete bug
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla >= 2.4.6" )
         # On RHEL6 we are using SCL packages for Qt
-        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scl-utils,mantidlibs,mantidlibs-runtime,mantidlibs-qt,mantidlibs-qt-x11" )
+        set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},scl-utils,mantidlibs34,mantidlibs34-runtime,mantidlibs34-qt,mantidlibs34-qt-x11" )
       else()
         set ( CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES} qscintilla" )
       endif()