[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-704-g97ac2ea

[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  97ac2eacf44d7b2314271c6bdc37e0ec165c73dc (commit)
       via  a351edd2452f191988253da3f7b537f8e505f794 (commit)
      from  6d89ece6dd81dd1aa223ff11dc0420439a53f43a (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97ac2eacf44d7b2314271c6bdc37e0ec165c73dc
commit 97ac2eacf44d7b2314271c6bdc37e0ec165c73dc
Merge: 6d89ece a351edd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 15:28:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 15:28:07 2016 -0400

    Merge topic 'cpack-rpm-better-directive-match' into next
    
    a351edd2 CPackRPM: Handle directives of form %foo and %foo(anything)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a351edd2452f191988253da3f7b537f8e505f794
commit a351edd2452f191988253da3f7b537f8e505f794
Author:     Andrew Fuller <afuller at teradici.com>
AuthorDate: Fri Jun 24 10:45:40 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 15:27:56 2016 -0400

    CPackRPM: Handle directives of form %foo and %foo(anything)
    
    Directives that are legal inside the %files section of an RPM spec may
    contain a variety of characters particularly when specifying %caps which
    can include +, _, and space.  Watch for parenthesis to determine what
    forms the prefix vs. path.
    
    Fixes #14362.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d231ff0..7706bbc 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -1683,8 +1683,8 @@ function(cpack_rpm_generate_package)
 
     set(CPACK_RPM_USER_INSTALL_FILES "")
     foreach(F IN LISTS CPACK_RPM_USER_FILELIST_INTERNAL)
-      string(REGEX REPLACE "%[A-Za-z0-9\(\),-]* " "" F_PATH ${F})
-      string(REGEX MATCH "%[A-Za-z0-9\(\),-]*" F_PREFIX ${F})
+      string(REGEX REPLACE "%[A-Za-z]+(\\([^()]*\\))? " "" F_PATH ${F})
+      string(REGEX MATCH "%[A-Za-z]+(\\([^()]*\\))?" F_PREFIX ${F})
 
       if(CPACK_RPM_PACKAGE_DEBUG)
         message("CPackRPM:Debug: F_PREFIX=<${F_PREFIX}>, F_PATH=<${F_PATH}>")

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

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


hooks/post-receive
-- 
CMake