From b08da722f7fc8a868c463165a3f15bdd4512e174 Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Thu, 7 Jan 2016 17:21:53 -0800 Subject: [PATCH] cmake: Updated RPM packaging config to match DEB. Signed-off-by: Henry Bruce Signed-off-by: Abhishek Malik --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a6f4fcb..a7f81961 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,10 +182,9 @@ if (RPM) message (INFO " - RPM packaging enabled for ${DETECTED_ARCH}") set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR "RPM") - set(CPACK_PACKAGE_NAME "libupm${upm_VERSION_MAJOR}") - set(CPACK_PACKAGE_RELEASE 1) + set(CPACK_PACKAGE_NAME "upm") set(CPACK_PACKAGE_VERSION - "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}-${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") + "${upm_VERSION_MAJOR}.${upm_VERSION_MINOR}.${upm_VERSION_PATCH}.${upm_PACKAGE_ON_TAG}${VERSION_COMMIT}") set(CPACK_PACKAGE_CONTACT "Intel IoT-Devkit") set(CPACK_PACKAGE_VENDOR "Intel IoT-Devkit") set(CPACK_RPM_PACKAGE_REQUIRES "mraa >= ${MRAA_VERSION}") @@ -196,7 +195,7 @@ if (RPM) COMMAND tr \\n \\t COMMAND sed -e s/\\t// OUTPUT_VARIABLE DIST_TAG) - set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${DIST_TAG}.${DETECTED_ARCH}") + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}.${DIST_TAG}.${DETECTED_ARCH}") include(CPack) endif()