[Cmake-commits] CMake branch, next, updated. v2.8.9-66-gb169cd2

[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  b169cd223d088294649f12aa11f9c0588dbb95bf (commit)
       via  4198963098851671697b2f646c8002da25bbec2e (commit)
      from  a95c96f4c247a8643403cd546f381c07cc4b9e4d (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=b169cd223d088294649f12aa11f9c0588dbb95bf
commit b169cd223d088294649f12aa11f9c0588dbb95bf
Merge: a95c96f 4198963
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Aug 14 13:44:10 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 14 13:44:10 2012 -0400

    Merge topic 'CPackRPM_handleAttrDirectiveProperly' into next
    
    4198963 Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4198963098851671697b2f646c8002da25bbec2e
commit 4198963098851671697b2f646c8002da25bbec2e
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: Tue Aug 14 19:39:49 2012 +0200

    Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.
    
    This is a fix of bug #0013468 from Viktor Dubrovsky.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 066b295..6355a7c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -728,8 +728,8 @@ 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-z\(\)-\,]* " "" F_PATH ${F})
+    string(REGEX MATCH "%[A-Za-z\(\)-\,]*" F_PREFIX ${F})
 
     if(F_PREFIX)
         set(F_PREFIX "${F_PREFIX} ")

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

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


hooks/post-receive
-- 
CMake