修复RPM包构建名称.v4.2.65

2 files changed, 11 insertions, 13 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index da3d28b..b910385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,6 +150,7 @@ envelope_rpm:
     - ls $RPM_FULL_PATH
     - export BIN_TO_PROTECT_IN_RPM="${INSTALL_PREFIX}/sapp"
     - export | grep BIN_TO_PROTECT_IN_RPM
+    - rpm -qlp --provides $CI_PROJECT_DIR/build/*.rpm | grep "="
     - /root/rebuildrpm_and_envelope.sh $RPM_FULL_PATH $BIN_TO_PROTECT_IN_RPM $FEATURE_ID $APP_NAME_IN_RPM_SPEC
   tags:
     - envelope
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index ca27732..bef2c06 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -13,24 +13,21 @@ set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}.${VERSION_BUILD}")
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
 
-
-
-execute_process(COMMAND bash -c "echo CPACK_PACKAGE_VERSION=$CPACK_PACKAGE_VERSION" >> /tmp/ci.log)
-
-execute_process(COMMAND bash -c "echo CPACK_RPM_EXECUTABLE_FILE_NAME=$CPACK_RPM_EXECUTABLE_FILE_NAME" >> /tmp/ci.log)
-
-execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $(NF-1)\".\"$NF}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
+#execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $(NF-1)\".\"$NF}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
 execute_process(COMMAND sh changelog.sh ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
 SET(CPACK_RPM_CHANGELOG_FILE ${CMAKE_BINARY_DIR}/changelog.txt)
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
-set(CPACK_RPM_PACKAGE_VENDOR "MESA")
+set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON)
+set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
-#set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST "on")
 set(CPACK_RPM_DEBUGINFO_PACKAGE "on")
+set(CPACK_RPM_PACKAGE_VENDOR "MESA")
+
+#set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on")
 
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
@@ -39,8 +36,8 @@ set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
 
 set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE)
 set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
-set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+#set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+#set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 
 set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable")
 set(CPACK_COMPONENT_LIBRARY_GROUP "executable")
@@ -48,8 +45,8 @@ set(CPACK_COMPONENT_PROFILE_GROUP "executable")
 
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
-set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+#set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+#set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_COMPONENT_HEADER_GROUP "header")
 
 set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})