diff options
| author | Eric Noulard <eric.noulard@gmail.com> | 2009-11-22 17:52:47 (GMT) |
|---|---|---|
| committer | Eric Noulard <eric.noulard@gmail.com> | 2009-11-22 17:52:47 (GMT) |
| commit | 03a8e912cb9a4ad8d0ad2eb96f9ce0b928fb8597 (patch) | |
| tree | f96949d951e65bbd014aaf6dcee78fd1d6a7fadd /Modules/CPackRPM.cmake | |
| parent | a10198c54e1e9a3798360ffc253325f9f643e272 (diff) | |
| download | CMake-03a8e912cb9a4ad8d0ad2eb96f9ce0b928fb8597.zip CMake-03a8e912cb9a4ad8d0ad2eb96f9ce0b928fb8597.tar.gz CMake-03a8e912cb9a4ad8d0ad2eb96f9ce0b928fb8597.tar.bz2 | |
CPackRPM: do not forget to include installed symlinks (bug 9927)
Eric
Diffstat (limited to 'Modules/CPackRPM.cmake')
| -rw-r--r-- | Modules/CPackRPM.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 7bc6967..c029980 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -363,7 +363,9 @@ SET(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}") SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}") # 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/\\.//} WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}" OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES) @@ -446,6 +448,8 @@ mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT ${CPACK_RPM_INSTALL_FILES} %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> Replace prep and build step with backup and restore of the previously CPack installed tree. This should |