[Cmake-commits] CMake branch, next, updated. v3.6.2-2386-ga11ba9e

[Domen Vrankar]

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  a11ba9ee3bc679320d48f207535584cbb14a0e8a (commit)
       via  04310070588df956f8a925e3ca873ca290a3bd99 (commit)
      from  11d9a18decaffe6cd8941f7e578c54b0b77c579f (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=a11ba9ee3bc679320d48f207535584cbb14a0e8a
commit a11ba9ee3bc679320d48f207535584cbb14a0e8a
Merge: 11d9a18 0431007
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Sep 22 13:44:09 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 22 13:44:09 2016 -0400

    Merge topic 'cpack-rpm-debuginfo-sources' into next
    
    04310070 fixup! CPack/RPM debuginfo packaging documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04310070588df956f8a925e3ca873ca290a3bd99
commit 04310070588df956f8a925e3ca873ca290a3bd99
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Sep 22 19:43:49 2016 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Thu Sep 22 19:43:49 2016 +0200

    fixup! CPack/RPM debuginfo packaging documentation

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 4ae0382..d880b24 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -760,15 +760,33 @@
 #
 # .. note::
 #
-#  Each source path prefix is additionaly suffixed by ``src_${index_}`` where
-#  index_ is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
-#  variable. This produces ``${CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX}/src_${index_}``
+#  Each source path prefix is additionaly suffixed by ``src_<index>`` where
+#  index is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS`
+#  variable. This produces ``<CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX>/src_<index>``
 #  replacement path.
 #  Limitation is that replaced path part must be shorter or of equal
 #  length than the length of its replacement. If that is not the case either
 #  :variable:`CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX` variable has to be set to
 #  a shorter path or source directories must be placed on a longer path.
 #
+# .. variable:: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS
+#
+#  Directories containing sources that should be excluded from debuginfo packages.
+#
+#  * Mandatory : NO
+#  * Default   : "/usr /usr/src /usr/src/debug"
+#
+#  Listed paths are owned by other RPM packages and should therefore not be
+#  deleted on debuginfo package uninstallation.
+#
+# .. variable:: CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS_ADDITION
+#
+#  Paths that should be appended to :variable:`CPACK_RPM_DEBUGINFO_EXCLUDE_DIRS`
+#  for exclusion.
+#
+#  * Mandatory : NO
+#  * Default   : -
+#
 # Packaging of sources (SRPM)
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 #

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

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


hooks/post-receive
-- 
CMake