[Cmake-commits] CMake branch, next, updated. v2.8.4-1731-g9faa59d

[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  9faa59d3e89e47e24b9deb535d00070b65e9a017 (commit)
       via  2af80c76eedb2dd04ef796d1464fc791ec8cc0ae (commit)
       via  05720c75c1795d4be3ebeab99f01f0faceba5009 (commit)
       via  05610bf2832bb401d997fee58b9f48248ec994f9 (commit)
       via  6e74e363208eb5972066d3493fc10db8ec7fdd8c (commit)
      from  a050030016e09a6a853b26b676bd0562721e25f1 (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=9faa59d3e89e47e24b9deb535d00070b65e9a017
commit 9faa59d3e89e47e24b9deb535d00070b65e9a017
Merge: a050030 2af80c7
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Jun 12 06:51:43 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 12 06:51:43 2011 -0400

    Merge topic 'ImproveCPackRPMdoc' into next
    
    2af80c7 Add some more Specs file tag handling.
    05720c7 CPackRPM: Enhance documentation
    05610bf KWSys Nightly Date Stamp
    6e74e36 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2af80c76eedb2dd04ef796d1464fc791ec8cc0ae
commit 2af80c76eedb2dd04ef796d1464fc791ec8cc0ae
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Jun 12 12:49:44 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Jun 12 12:49:44 2011 +0200

    Add some more Specs file tag handling.

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 4718d37..729d8df 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -370,7 +370,7 @@ if(CPACK_RPM_PACKAGE_RELOCATABLE)
 endif(CPACK_RPM_PACKAGE_RELOCATABLE)
 
 # check if additional fields for RPM spec header are given
-FOREACH(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX)
+FOREACH(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV)
   IF(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER})
     STRING(LENGTH ${_RPM_SPEC_HEADER} _PACKAGE_HEADER_STRLENGTH)
     MATH(EXPR _PACKAGE_HEADER_STRLENGTH "${_PACKAGE_HEADER_STRLENGTH} - 1")
@@ -579,6 +579,10 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
 \@TMP_RPM_REQUIRES\@
 \@TMP_RPM_PROVIDES\@
 \@TMP_RPM_OBSOLETES\@
+\@TMP_RPM_CONFLICTS\@
+\@TMP_RPM_AUTOPROV\@
+\@TMP_RPM_AUTOREQ\@
+\@TMP_RPM_AUTOREQPROV\@
 \@TMP_RPM_BUILDARCH\@
 \@TMP_RPM_PREFIX\@
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05720c75c1795d4be3ebeab99f01f0faceba5009
commit 05720c75c1795d4be3ebeab99f01f0faceba5009
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Jun 12 12:12:24 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Jun 12 12:12:24 2011 +0200

    CPackRPM: Enhance documentation

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index b711bc2..4718d37 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -4,8 +4,10 @@
 # used by CPack : http://www.cmake.org/Wiki/CMake:CPackConfiguration
 #
 # However CPackRPM has specific features which are controlled by
-# the specifics CPACK_RPM_XXX variables. You'll find a detailed usage on
-# the wiki:
+# the specifics CPACK_RPM_XXX variables.
+# Usually those vars correspond to RPM spec file entities, one may find
+# information about spec files here http://www.rpm.org/wiki/Docs.
+# You'll find a detailed usage of CPackRPM on the wiki:
 #  http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29
 # However as a handy reminder here comes the list of specific variables:
 #
@@ -68,6 +70,8 @@
 #     Note that you must enclose the complete requires string between quotes,
 #     for example:
 #     set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.5.0, cmake >= 2.8")
+#     The required package list of an RPM file could be printed with
+#     rpm -qp --requires file.rpm
 #  CPACK_RPM_PACKAGE_SUGGESTS
 #     Mandatory : NO
 #     Default   : -
@@ -77,6 +81,8 @@
 #     Mandatory : NO
 #     Default   : -
 #     May be used to set RPM dependencies (provides).
+#     The provided package list of an RPM file could be printed with
+#     rpm -qp --provides file.rpm
 #  CPACK_RPM_PACKAGE_OBSOLETES
 #     Mandatory : NO
 #     Default   : -

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

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


hooks/post-receive
-- 
CMake