From b64c15b097603fba142c17251a1b49d99b5c93f2 Mon Sep 17 00:00:00 2001 From: Steve Muskiewicz Date: Wed, 30 Jun 2021 11:43:58 -0400 Subject: [PATCH] Fixes for RPM packaging issues (on CentOS 8): * add "common" package provides for `libcedar.so()(64bit)` to allow `softether-vpnserver` package to install properly * exclude `/lib/systemd/system` paths from RPM package file listing to prevent file conflicts when installing RPM (these paths already are "owned" by the systemd RPM) --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6edcc0f..e61dac51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ if(UNIX) set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet") set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0") + set(CPACK_RPM_COMMON_PACKAGE_PROVIDES "libcedar.so()(64bit)") # Exclude system directories if(CPACK_GENERATOR STREQUAL "RPM") @@ -96,6 +97,9 @@ if(UNIX) OUTPUT_VARIABLE CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ERROR_QUIET) endif() + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd") + list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system") include(CPack) endif()