From 61fb04b1f53243195f1a92785533125c5c43d00c Mon Sep 17 00:00:00 2001 From: jgoutin Date: Wed, 13 Apr 2022 16:15:04 +0200 Subject: [PATCH] Fix missmatch between RPM metadata and RPM file name on "noarch" and prerelease packages. --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1e3819f..c442e956 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -443,6 +443,7 @@ if (PKG) if (RPMBUILD) set(CPACK_GENERATOR "RPM") set(CPACK_RPM_COMPONENT_INSTALL ON) + string(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}) # Get dist RPM Release dist value (ex: "el7") execute_process(COMMAND sh /usr/lib/rpm/redhat/dist.sh @@ -451,11 +452,12 @@ if (PKG) # Runtime package set(CPACK_RPM_RUN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") - set(CPACK_RPM_RUN_FILE_NAME "${CPACK_PACKAGE_NAME}-${ACCELIZEDRM_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.${CMAKE_SYSTEM_PROCESSOR}.rpm") + set(CPACK_RPM_RUN_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.${CMAKE_SYSTEM_PROCESSOR}.rpm") # Dev package set(CPACK_RPM_DEV_PACKAGE_NAME "${CPACK_PACKAGE_NAME}-devel") - set(CPACK_RPM_DEV_FILE_NAME "${CPACK_RPM_DEV_PACKAGE_NAME}-${ACCELIZEDRM_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.noarch.rpm") + set(CPACK_RPM_DEV_PACKAGE_ARCHITECTURE "noarch") + set(CPACK_RPM_DEV_FILE_NAME "${CPACK_RPM_DEV_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.noarch.rpm") set(CPACK_RPM_DEV_PACKAGE_SUMMARY ${CPACK_COMPONENT_DEV_DESCRIPTION}) set(CPACK_RPM_DEV_PACKAGE_REQUIRES "${CPACK_PACKAGE_NAME}, libcurl-devel, jsoncpp-devel") @@ -471,7 +473,7 @@ if (PKG) # Configure package set(CPACK_RPM_PYTHON3_PACKAGE_NAME "python3-accelize-drm") - set(CPACK_RPM_PYTHON3_FILE_NAME "${CPACK_RPM_PYTHON3_PACKAGE_NAME}-${ACCELIZEDRM_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.${CMAKE_SYSTEM_PROCESSOR}.rpm") + set(CPACK_RPM_PYTHON3_FILE_NAME "${CPACK_RPM_PYTHON3_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}${CPACK_RPM_PACKAGE_RELEASE_DIST}.${CMAKE_SYSTEM_PROCESSOR}.rpm") set(CPACK_RPM_PYTHON3_PACKAGE_SUMMARY ${CPACK_COMPONENT_PYTHON3_DESCRIPTION}) set(CPACK_RPM_PYTHON3_PACKAGE_GROUP "Development/Libraries/Python")