FIXED: #81306 - sequence was not included in the package file names in release mode

The previous code was using _ because RPM does not like - in the version number. The correct fix is to
pass x.y.x version only to the rpm version number setting, and append the sequence only to the filename
and BUILD_TAG

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

CMakeLists.txt

@@ -305,11 +305,11 @@ if ( CMAKE_SYSTEM MATCHES Linux )
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
 
     if ( ${packageManagement} STREQUAL "DEB" )
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}${packageRevisionArch}")
+        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${packageRevisionArch}")
     elseif ( ${packageManagement} STREQUAL "RPM" )
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}.${packageRevisionArch}")
+        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}.${packageRevisionArch}")
         else()
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${CPACK_SYSTEM_NAME}")
+        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}-${CPACK_SYSTEM_NAME}")
     endif ()
 endif ( CMAKE_SYSTEM MATCHES Linux )
 MESSAGE ("-- Current release version is ${CPACK_PACKAGE_FILE_NAME}")
@@ -342,7 +342,7 @@ set(CPACK_SOURCE_IGNORE_FILES
 ###
 ## Run file configuration to set build tag
 ###
-set( BUILD_TAG "${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_RELEASE}")
+set( BUILD_TAG "${CPACK_RPM_PACKAGE_VERSION}_${CPACK_RPM_PACKAGE_RELEASE}-${stagever}")
 configure_file(${HPCC_SOURCE_DIR}/build-config.h.cmake "build-config.h" )
 configure_file("initfiles/etc/DIR_NAME/version.in" "version")
 configure_file("initfiles/etc/DIR_NAME/environment.conf.in" "environment.conf")

cmake_modules/commonSetup.cmake

@@ -129,15 +129,14 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
   set(minorver ${HPCC_MINOR})
   set(point ${HPCC_POINT})
   if ( "${HPCC_MATURITY}" STREQUAL "release" )
-    set(stagever "")
-    set(version ${majorver}.${minorver}.${point})
+    set(stagever "${HPCC_SEQUENCE}")
   else()
-    set(stagever "${HPCC_MATURITY}${HPCC_SEQUENCE}")
-    set(version ${majorver}.${minorver}.${point}_${stagever})
+    set(stagever "${HPCC_SEQUENCE}${HPCC_MATURITY}")
   endif()
+  set(version ${majorver}.${minorver}.${point})
 
   IF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    set( version "${version}_Debug" )
+    set( stagever "${stagever}_Debug" )
   ENDIF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 
   ###########################################################################