This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 53899460dfb1aef50ad3bb7acd1ec30d618cc5e7 (commit)
via 6926e9114c832607bdad97827bb918cb21ab231d (commit)
from 5858e6d62addd823cd130fd430887f29188a839b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53899460dfb1aef50ad3bb7acd1ec30d618cc5e7
commit 53899460dfb1aef50ad3bb7acd1ec30d618cc5e7
Merge: 5858e6d 6926e91
Author: Eric NOULARD <eric.noul...@gmail.com>
Date: Sun Jul 4 15:10:18 2010 +0200
Merge branch 'CPackRPM-handleFileWithSpace' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6926e9114c832607bdad97827bb918cb21ab231d
commit 6926e9114c832607bdad97827bb918cb21ab231d
Author: Eric NOULARD <eric.noul...@gmail.com>
Date: Sun Jul 4 14:05:25 2010 +0200
CPackRPM:: Quote every filenames in %file section (see bugs
10701,10871,10345)
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 3bf8e0e..ae679f0 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -396,12 +396,13 @@ SET(CPACK_RPM_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}")
# Use files tree to construct files command (spec file)
# We should not forget to include symlinks (thus -o -type l)
-# We must remove the './' due to the local search (thus the sed)
+# We must remove the './' due to the local search and escape the
+# file name by enclosing it between double quotes (thus the sed)
# Then we must authorize any man pages extension (adding * at the end)
# because rpmbuild may automatically compress those files
EXECUTE_PROCESS(COMMAND find -type f -o -type l
- COMMAND sed {s/\\.//}
- COMMAND sed {s/.*man.*\\/.*/&*/}
+ COMMAND sed {s:.*/man.*/.*:&*:}
+ COMMAND sed {s/\\.\\\(.*\\\)/\"\\1\"/}
WORKING_DIRECTORY
"${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}"
OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackRPM.cmake | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
