[Cmake-commits] CMake branch, next, updated. v2.8.11.2-2957-g3bb571c

[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  3bb571c197e4428323fc6de4e4c7e7c323d40a40 (commit)
       via  976e51d3a9afb75afd62e0c942baa3a3f785f6a2 (commit)
       via  448a67714825a6d3018a6974153de6771080a8e6 (commit)
      from  b9c8392ba3c76864a70254ccfddcf80393e96df5 (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=3bb571c197e4428323fc6de4e4c7e7c323d40a40
commit 3bb571c197e4428323fc6de4e4c7e7c323d40a40
Merge: b9c8392 976e51d
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Jul 8 04:40:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 8 04:40:00 2013 -0400

    Merge topic 'CPack-fixGeneratedChangelogFormat' into next
    
    976e51d CPackRPM make the changelog line conform to expected format
    448a677 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=976e51d3a9afb75afd62e0c942baa3a3f785f6a2
commit 976e51d3a9afb75afd62e0c942baa3a3f785f6a2
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Jul 8 10:32:53 2013 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Jul 8 10:32:53 2013 +0200

    CPackRPM make the changelog line conform to expected format

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 52fdc91..681bb91 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -637,7 +637,7 @@ if(CPACK_RPM_CHANGELOG_FILE)
     message(SEND_ERROR "CPackRPM:Warning: CPACK_RPM_CHANGELOG_FILE <${CPACK_RPM_CHANGELOG_FILE}> does not exists - ignoring")
   endif()
 else()
-  set(CPACK_RPM_SPEC_CHANGELOG "* Sun Jul 4 2010 Erk <eric.noulard at gmail.com>\n  Generated by CPack RPM (no Changelog file were provided)")
+  set(CPACK_RPM_SPEC_CHANGELOG "* Sun Jul 4 2010 Eric Noulard <eric.noulard at gmail.com> - ${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}\n  Generated by CPack RPM (no Changelog file were provided)")
 endif()
 
 # CPACK_RPM_SPEC_MORE_DEFINE

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

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


hooks/post-receive
-- 
CMake