[Cmake-commits] CMake branch, next, updated. v2.8.4-1577-gcdaac15

[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  cdaac15fdc77082e4ebcccb6c2b3ca8feedd9b98 (commit)
       via  db45b10ff7b977569ee0f9a01b790aa67da3f639 (commit)
       via  41c83c1bdc1bb09a10258b2403d098eb0440cca1 (commit)
      from  3226fc518d16b119db46394621608933e89f661c (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=cdaac15fdc77082e4ebcccb6c2b3ca8feedd9b98
commit cdaac15fdc77082e4ebcccb6c2b3ca8feedd9b98
Merge: 3226fc5 db45b10
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat May 21 06:36:53 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat May 21 06:36:53 2011 -0400

    Merge topic 'CPackRPM-fixForAIX' into next
    
    db45b10 CPack  make RPM work on AIX. fix #0012183 merge patch from Pasi Valminen
    41c83c1 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db45b10ff7b977569ee0f9a01b790aa67da3f639
commit db45b10ff7b977569ee0f9a01b790aa67da3f639
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sat May 21 12:34:37 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sat May 21 12:34:37 2011 +0200

    CPack  make RPM work on AIX. fix #0012183 merge patch from Pasi Valminen

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index d9d074c..b711bc2 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -489,9 +489,9 @@ ENDIF(CPACK_RPM_PACKAGE_COMPONENT)
 # file name by enclosing it between double quotes (thus the sed)
 # Then we must authorize any man pages extension (adding * at the end)
 # because rpmbuild may automatically compress those files
-EXECUTE_PROCESS(COMMAND find -type f -o -type l
-                COMMAND sed {s:.*/man.*/.*:&*:}
-                COMMAND sed {s/\\.\\\(.*\\\)/\"\\1\"/}
+EXECUTE_PROCESS(COMMAND find . -type f -o -type l
+                COMMAND sed s:.*/man.*/.*:&*:
+                COMMAND sed s/\\.\\\(.*\\\)/\"\\1\"/
                 WORKING_DIRECTORY "${WDIR}"
                 OUTPUT_VARIABLE CPACK_RPM_INSTALL_FILES)
 

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

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


hooks/post-receive
-- 
CMake