[Cmake-commits] CMake branch, next, updated. v2.8.9-436-g4b85e7b

[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  4b85e7bee3e166fa513b52567918262eb2aaa8ef (commit)
       via  d8a1dd5865a86a719420ef80797732dfefff0258 (commit)
       via  4e20ca7726269e2403fa9e18c316fb6c65391b44 (commit)
       via  c19daefcec890dbcfc334c240ed2ec7b7597af2a (commit)
      from  95af29f6dd835f365d8dc8e3039aa2a52036485d (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=4b85e7bee3e166fa513b52567918262eb2aaa8ef
commit 4b85e7bee3e166fa513b52567918262eb2aaa8ef
Merge: 95af29f d8a1dd5
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Sep 10 16:41:48 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 10 16:41:48 2012 -0400

    Merge topic 'CPackRPM_handleAttrDirectiveProperly-reloaded' into next
    
    d8a1dd5 Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.
    4e20ca7 CMake Nightly Date Stamp
    c19daef CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8a1dd5865a86a719420ef80797732dfefff0258
commit d8a1dd5865a86a719420ef80797732dfefff0258
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Aug 14 19:39:49 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Sep 10 22:35:02 2012 +0200

    Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.
    
    This triggered an unknown secondary bug when there is
    no ABSOLUTE INSTALL file. This is fixed as well.
    
    This is based on a fix of bug #0013468 from Viktor Dubrovsky.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index b5826ef..0cec897 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -728,18 +728,24 @@ if(CPACK_RPM_USER_FILELIST_INTERNAL)
 
   set(CPACK_RPM_USER_INSTALL_FILES "")
   foreach(F IN LISTS CPACK_RPM_USER_FILELIST_INTERNAL)
-    string(REGEX REPLACE "%[A-Za-z\(\)]* " "" F_PATH ${F})
-    string(REGEX MATCH "%[A-Za-z\(\)]*" F_PREFIX ${F})
+    string(REGEX REPLACE "%[A-Za-z0-9\(\),-]* " "" F_PATH ${F})
+    string(REGEX MATCH "%[A-Za-z0-9\(\),-]*" F_PREFIX ${F})
 
+    if(CPACK_RPM_PACKAGE_DEBUG)
+      message("CPackRPM:Debug: F_PREFIX=<${F_PREFIX}>, F_PATH=<${F_PATH}>")
+    endif()
     if(F_PREFIX)
-        set(F_PREFIX "${F_PREFIX} ")
+      set(F_PREFIX "${F_PREFIX} ")
     endif()
     # Rebuild the user list file
     set(CPACK_RPM_USER_INSTALL_FILES "${CPACK_RPM_USER_INSTALL_FILES}${F_PREFIX}\"${F_PATH}\"\n")
 
     # Remove from CPACK_RPM_INSTALL_FILES and CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL
     list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${F_PATH})
-    list(REMOVE_ITEM CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL ${F_PATH})
+    # ABSOLUTE destination files list may not exists at all
+    if (CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL)
+      list(REMOVE_ITEM CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL ${F_PATH})
+    endif()
 
   endforeach()
 

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

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


hooks/post-receive
-- 
CMake