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 95af29f6dd835f365d8dc8e3039aa2a52036485d (commit)
via 3608a3664787504f03289f3d44650616c18063a8 (commit)
from ca055dbab1cb48de5decc3d5a05a046299596bc0 (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=95af29f6dd835f365d8dc8e3039aa2a52036485d
commit 95af29f6dd835f365d8dc8e3039aa2a52036485d
Merge: ca055db 3608a36
Author: Eric Noulard <eric.noul...@gmail.com>
AuthorDate: Mon Sep 10 16:41:12 2012 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 10 16:41:12 2012 -0400
Merge topic 'CPackRPM_handleAttrDirectiveProperly' into next
3608a36 Revert "Handles %attr(nnn,-,-) /path/to/file in
CPACK_RPM_USER_FILELIST properly."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3608a3664787504f03289f3d44650616c18063a8
commit 3608a3664787504f03289f3d44650616c18063a8
Author: Eric NOULARD <eric.noul...@gmail.com>
AuthorDate: Mon Sep 10 22:37:40 2012 +0200
Commit: Eric NOULARD <eric.noul...@gmail.com>
CommitDate: Mon Sep 10 22:37:40 2012 +0200
Revert "Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST
properly."
This reverts commit 4198963098851671697b2f646c8002da25bbec2e.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 6355a7c..066b295 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
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
