[Cmake-commits] CMake branch, next, updated. v3.1.0-1885-g0965a0f

[Brad King]

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  0965a0f01819c0e1d727ab1ee41fbd8123c7925b (commit)
       via  38802dc00af0ea5ffc8ef224bd42bbb54d410b57 (commit)
      from  c990a180a963ca8f9df769f84533cb2fb0199750 (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=0965a0f01819c0e1d727ab1ee41fbd8123c7925b
commit 0965a0f01819c0e1d727ab1ee41fbd8123c7925b
Merge: c990a18 38802dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 10:03:33 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 14 10:03:33 2015 -0500

    Merge topic 'rpm_at_in_path' into next
    
    38802dc0 Revert "rpm revert at in path escaping patch"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38802dc00af0ea5ffc8ef224bd42bbb54d410b57
commit 38802dc00af0ea5ffc8ef224bd42bbb54d410b57
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 14 10:03:10 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 14 10:03:10 2015 -0500

    Revert "rpm revert at in path escaping patch"
    
    This reverts commit 5d0a04f09487dacac5520c6e963a64cce854d2bd.
    It will be restored with a test case.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 7de3aa3..d2cb2ee 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1058,6 +1058,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.
 #
@@ -1168,6 +1175,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 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
CMake