kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CPackRPM: do not forget to include installed symlinks (bug 9927) 

Eric
This commit is contained in:
Eric Noulard 2009-11-22 12:52:47 -05:00
parent a10198c54e
commit 03a8e912cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/CPackRPM.cmake
View File

@ -363,7 +363,9 @@ SET(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}")
SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}") SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
# Use files tree to construct files command (spec file) # Use files tree to construct files command (spec file)
EXECUTE_PROCESS(COMMAND find -type f # We should not forget to include symlinks (thus -o -type l)
# We must remove the './' due to the local search (thus the sed)
EXECUTE_PROCESS(COMMAND find -type f -o -type l
COMMAND sed {s/\\.//} COMMAND sed {s/\\.//}
WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}" WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES) OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
@ -446,6 +448,8 @@ mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
${CPACK_RPM_INSTALL_FILES} ${CPACK_RPM_INSTALL_FILES}
%changelog %changelog
* Sun Nov 22 2009 Erk <eric.noulard@gmail.com>
Include symlinks in the file list.
* Sat Nov 14 2009 Erk <eric.noulard@gmail.com> * Sat Nov 14 2009 Erk <eric.noulard@gmail.com>
Replace prep and build step with backup and restore Replace prep and build step with backup and restore
of the previously CPack installed tree. This should of the previously CPack installed tree. This should