[Cmake-commits] CMake branch, next, updated. v2.8.5-1820-g07b267b

[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  07b267b63af01be1a12fd12cc7b5493cf2893da8 (commit)
       via  f9e527794159844963f6bd67b5627026a0f552a6 (commit)
      from  434f8d1ada9f0749ad8b2a8887c5c77ccd206cd3 (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=07b267b63af01be1a12fd12cc7b5493cf2893da8
commit 07b267b63af01be1a12fd12cc7b5493cf2893da8
Merge: 434f8d1 f9e5277
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Sep 5 16:16:48 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 5 16:16:48 2011 -0400

    Merge topic 'CPackRPM-includeDir' into next
    
    f9e5277 CPackRPM fix #12305, include directories in RPM package


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9e527794159844963f6bd67b5627026a0f552a6
commit f9e527794159844963f6bd67b5627026a0f552a6
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Sep 5 22:15:31 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Sep 5 22:15:31 2011 +0200

    CPackRPM fix #12305, include directories in RPM package

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 729d8df..fa0bc72 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -491,11 +491,13 @@ ELSE(CPACK_RPM_PACKAGE_COMPONENT)
 ENDIF(CPACK_RPM_PACKAGE_COMPONENT)
 # Use files tree to construct files command (spec file)
 # We should not forget to include symlinks (thus -o -type l)
+# We should include directory as well (thus -type d)
+#   but not the main local dir "." (thus -a -not -name ".")
 # We must remove the './' due to the local search and escape the
 # 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
+EXECUTE_PROCESS(COMMAND find . -type f -o -type l -o (-type d -a -not -name ".")
                 COMMAND sed s:.*/man.*/.*:&*:
                 COMMAND sed s/\\.\\\(.*\\\)/\"\\1\"/
                 WORKING_DIRECTORY "${WDIR}"

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

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


hooks/post-receive
-- 
CMake