[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2937-gd26f9f7

[Eric Noulard]

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  d26f9f7cd98edae74f50c0bc82098aeda963a718 (commit)
       via  1703e069a91b29e4d8ea142fd66192ec4172b5ee (commit)
       via  bdc66ea7c57eb9530419409721a5c41c0883d052 (commit)
      from  92619f3d3154784a5c1c326d3dc06efdf5b89757 (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=d26f9f7cd98edae74f50c0bc82098aeda963a718
commit d26f9f7cd98edae74f50c0bc82098aeda963a718
Merge: 92619f3 1703e06
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Jul 7 09:28:26 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jul 7 09:28:26 2013 -0400

    Merge topic 'CPackRPM-protectATinFilename-reloaded' into next
    
    1703e06 CPackRPM protect '@' character in filename processed in the spec file.
    bdc66ea CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1703e069a91b29e4d8ea142fd66192ec4172b5ee
commit 1703e069a91b29e4d8ea142fd66192ec4172b5ee
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Jul 5 18:52:36 2013 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Jul 5 18:52:36 2013 +0200

    CPackRPM protect '@' character in filename processed in the spec file.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 52fdc91..f61ec0f 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -876,6 +876,13 @@ if(CPACK_RPM_PACKAGE_DEBUG)
    message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
 endif()
 
+# protect @ in pathname in order to avoid their
+# interpretation during the configure_file step
+set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}")
+set(PROTECTED_AT "@")
+string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}")
+set(CPACK_RPM_INSTALL_FILES_LIST "")
+
 #
 # USER generated/provided spec file handling.
 #
@@ -982,6 +989,9 @@ else()
   configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY)
 endif()
 
+# remove AT protection
+unset(PROTECTED_AT)
+
 if(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   execute_process(

-----------------------------------------------------------------------

Summary of changes:
 Modules/CPackRPM.cmake    |   10 ++++++++++
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake