[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2719-ge543f9a

[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  e543f9a3617d5621f16f24a2082288cdd89a7b20 (commit)
       via  bac5772b3959c5dfda36f242f8726266f605fe54 (commit)
       via  2d8808520497aba6d82cc5ed54a715ab1d522423 (commit)
      from  aa0cf95184b97a747e3595df7a5c671a84599149 (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=e543f9a3617d5621f16f24a2082288cdd89a7b20
commit e543f9a3617d5621f16f24a2082288cdd89a7b20
Merge: aa0cf95 bac5772
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Apr 5 06:47:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 5 06:47:03 2013 -0400

    Merge topic 'CPackRPM-avoidOwningSystemDirs' into next
    
    bac5772 CPackRPM add mechanism to remove path from generated list of file in RPM spec.
    2d88085 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bac5772b3959c5dfda36f242f8726266f605fe54
commit bac5772b3959c5dfda36f242f8726266f605fe54
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Apr 5 12:43:50 2013 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Apr 5 12:43:50 2013 +0200

    CPackRPM add mechanism to remove path from generated list of file in RPM spec.
    
    This fixes bug #0013609, and is a possible solution to #0012864 as well.
    The later will be completely fixed in another way. Both approaches
    needs to be implemented because the current one is more automatic.
    
    Inspired-By: Ari

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index fa79e1b..bd649bb 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -223,6 +223,24 @@
 #     The refered file will be read and directly put after the %changelog
 #     section.
 ##end
+##variable
+#  CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST - list of path to be excluded.
+#     Mandatory : NO
+#     Default   : /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/include
+#     May be used to exclude path (directories or files) from the auto-generated
+#     list of paths discovered by CPack RPM. The defaut value contains a reasonable
+#     set of values if the variable is not defined by the user. If the variable
+#     is defined by the user then CPackRPM will NOT any of the default path.
+#     If you want to add some path to the default list then you can use
+#     CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION variable.
+##end
+##variable
+#  CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION - additional list of path to be excluded.
+#     Mandatory : NO
+#     Default   : -
+#     May be used to add more exclude path (directories or files) from the initial
+#     default list of excluded paths. See CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST.
+##end
 
 #=============================================================================
 # Copyright 2007-2009 Kitware, Inc.
@@ -666,6 +684,30 @@ if(CPACK_RPM_PACKAGE_RELOCATABLE)
   endforeach()
 endif()
 
+if (CPACK_RPM_PACKAGE_DEBUG)
+   message("CPackRPM:Debug: Initial list of path to OMIT in RPM: ${_RPM_DIRS_TO_OMIT}")
+endif()
+
+if (NOT DEFINED CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST /etc /etc/init.d /usr /usr/share /usr/share/doc /usr/bin /usr/lib /usr/include)
+  if (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION)
+    message("CPackRPM:Debug: Adding ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION} to builtin omit list.")
+    list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST "${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION}")
+  endif()
+endif()
+
+if(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST)
+  if (CPACK_RPM_PACKAGE_DEBUG)
+   message("CPackRPM:Debug: CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST= ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST}")
+ endif()
+  foreach(_DIR ${CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST})
+    list(APPEND _RPM_DIRS_TO_OMIT "-o;-path;.${_DIR}")
+  endforeach()
+endif()
+if (CPACK_RPM_PACKAGE_DEBUG)
+   message("CPackRPM:Debug: Final list of path to OMIT in RPM: ${_RPM_DIRS_TO_OMIT}")
+endif()
+
 # 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)

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

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


hooks/post-receive
-- 
CMake