fix(packaging): remove server version from cmapi version and package filename

Author: mariadb-LeonidFedorov

cmapi/CMakeLists.txt

@@ -168,7 +168,6 @@ if(RPM)
 
     set(CPACK_RPM_PACKAGE_OBSOLETES "mariadb-columnstore-cmapi")
     set(CPACK_RPM_PACKAGE_REQUIRES "curl")
-    string(REPLACE "-" "_" SERVER_VERSION ${SERVER_VERSION})
     get_linux_lsb_release_information()
 
     string(REGEX MATCH "^[0-9]+" OS_VERSION_MAJOR "${LSB_RELEASE_VERSION_SHORT}")
@@ -185,12 +184,12 @@ if(RPM)
     message(STATUS "OS_VERSION ${OS_VERSION}")
 
     set(CPACK_RPM_PACKAGE_FILE_NAME
-        "${CPACK_PACKAGE_NAME}-${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}-${CMAPI_VERSION_RELEASE}.${OS_VERSION}.${CMAKE_HOST_SYSTEM_PROCESSOR}"
+        "${CPACK_PACKAGE_NAME}-${CMAPI_PACKAGE_VERSION}-${CMAPI_VERSION_RELEASE}.${OS_VERSION}.${CMAKE_HOST_SYSTEM_PROCESSOR}"
     )
     message(STATUS "CPACK_RPM_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME}")
     set(CPACK_PACKAGE_FILE_NAME ${CPACK_RPM_PACKAGE_FILE_NAME})
     # version and release the same as in Columnstore engine package
-    set(CPACK_RPM_PACKAGE_VERSION "${SERVER_VERSION}_${CMAPI_PACKAGE_VERSION}")
+    set(CPACK_RPM_PACKAGE_VERSION "${CMAPI_PACKAGE_VERSION}")
     set(CPACK_RPM_PACKAGE_RELEASE "${CMAPI_VERSION_RELEASE}.${OS_VERSION}")
 endif()
 
@@ -214,7 +213,6 @@ if(DEB)
 
     set(CPACK_DEBIAN_PACKAGE_REPLACES "mariadb-columnstore-cmapi")
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "curl")
-    string(REPLACE "-" "." SERVER_VERSION ${SERVER_VERSION})
     set(PATCHLEVEL "+maria")
     get_linux_lsb_release_information()
     string(REGEX MATCH "^..." LSBID ${LSB_RELEASE_ID_SHORT})
@@ -228,12 +226,12 @@ if(DEB)
     )
     message(STATUS "ARCHITECTURE detected ${ARCHITECTURE}")
     set(CPACK_DEBIAN_PACKAGE_FILE_NAME
-        "${CPACK_PACKAGE_NAME}_${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}_${ARCHITECTURE}"
+        "${CPACK_PACKAGE_NAME}_${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}_${ARCHITECTURE}"
     )
     message(STATUS "CPACK_DEBIAN_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME}")
     set(CPACK_PACKAGE_FILE_NAME ${CPACK_DEBIAN_PACKAGE_FILE_NAME})
     # making possible to store several cmapi packages in one repo (same version as in Columnstore engine package)
-    set(CPACK_DEBIAN_PACKAGE_VERSION "${SERVER_VERSION}-${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}")
+    set(CPACK_DEBIAN_PACKAGE_VERSION "${CMAPI_PACKAGE_VERSION}${PATCHLEVEL}~${LSBID}${LSBVERSION}")
 endif()
 
 include(CPack)