Merge remote-tracking branch 'origin/feature/9323_cpack_generalization'

Code/Mantid/Build/CMake/CPackLinuxSetup.cmake

@@ -30,24 +30,15 @@ if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" OR ${UNIX_DIST} MATCHES "Fedora" OR
   if ( RPMBUILD_CMD )
     set ( CPACK_GENERATOR "RPM" )
     set ( CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}" )
+    set ( CPACK_RPM_PACKAGE_URL "http://www.mantidproject.org" )
+
     # reset the release name to include the RHEL version if known
-    if ( ${UNIX_CODENAME} MATCHES "Tikanga" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.el5" )
-    elseif ( ${UNIX_CODENAME} MATCHES "Santiago" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.el6" )
-    elseif ( ${UNIX_CODENAME} MATCHES "Laughlin" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc14" )
-    elseif ( ${UNIX_CODENAME} MATCHES "Lovelock" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc15" )
-    elseif ( ${UNIX_CODENAME} MATCHES "Verne" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc16" )
-    elseif ( ${UNIX_CODENAME} MATCHES "BeefyMiracle" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc17" )
-    elseif ( ${UNIX_CODENAME} MATCHES "SphericalCow" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc18" )
-    elseif ( ${UNIX_CODENAME} MATCHES "Heisenbug" )
-      set ( CPACK_RPM_PACKAGE_RELEASE "${CPACK_RPM_PACKAGE_RELEASE}.fc20" )
-    endif ( ${UNIX_CODENAME} MATCHES "Tikanga" )
+    if ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
+      string ( REGEX REPLACE "^([0-9])\\.[0-9]+$" "\\1" TEMP ${UNIX_RELEASE} )
+      set ( CPACK_RPM_PACKAGE_RELEASE "1.el${TEMP}" )
+    elseif ( ${UNIX_DIST} MATCHES "Fedora" )
+      set ( CPACK_RPM_PACKAGE_RELEASE "1.fc${UNIX_RELEASE}" )
+    endif ( ${UNIX_DIST} MATCHES "RedHatEnterprise" )
     
     # If CPACK_SET_DESTDIR is ON then the Prefix doesn't get put in the spec file
     if( CPACK_SET_DESTDIR )

Code/Mantid/Build/CMake/DetermineLinuxDistro.cmake

@@ -21,8 +21,15 @@ if ( LSB_CMD )
   # Make Scientific Linux and CentOS look like RHEL6
   string ( REGEX REPLACE "Carbon" "Santiago" UNIX_DIST ${UNIX_DIST} )
   string ( REGEX REPLACE "Final" "Santiago" UNIX_DIST ${UNIX_DIST} )
+  # get the release
+  execute_process ( COMMAND ${LSB_CMD} -r
+    OUTPUT_VARIABLE UNIX_RELEASE
+    OUTPUT_STRIP_TRAILING_WHITESPACE )
+  string ( REGEX REPLACE "Release:" "" UNIX_RELEASE ${UNIX_RELEASE} )
+  string ( STRIP ${UNIX_RELEASE} UNIX_RELEASE )
 else ( LSB_CMD )
   set ( UNIX_DIST "" )
   set ( UNIX_CODENAME "" )
+  set ( UNIX_RELEASE "" )
 endif ( LSB_CMD )
-message ( STATUS " DIST: ${UNIX_DIST} CODENAME: ${UNIX_CODENAME}" )
+message ( STATUS " DIST: ${UNIX_DIST} ${UNIX_RELEASE} CODENAME: ${UNIX_CODENAME}" )