[Cmake-commits] CMake branch, next, updated. v2.8.2-183-g1feda01

[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  1feda01ce2026c4ac4d3b10e70309a6a5eaf4519 (commit)
       via  7486396e5b4272546f085f0721294bb01e083202 (commit)
       via  efee95cd710808ca7ac261359b9b8e6dacb09211 (commit)
       via  4b661784b46f6017b12d0c2eb65bdbe649a0507a (commit)
      from  6b5f498e4b0cad48d7fceee3640bcb7f488ce0be (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=1feda01ce2026c4ac4d3b10e70309a6a5eaf4519
commit 1feda01ce2026c4ac4d3b10e70309a6a5eaf4519
Merge: 6b5f498 7486396
Author: Eric NOULARD <eric.noulard at gmail.com>
Date:   Sun Jul 4 11:48:29 2010 +0200

    Merge branch 'CPackRPM-fixDashInRPMVersion' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7486396e5b4272546f085f0721294bb01e083202
commit 7486396e5b4272546f085f0721294bb01e083202
Author: Eric NOULARD <eric.noulard at gmail.com>
Date:   Sun Jul 4 11:43:33 2010 +0200

    CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 3bf8e0e..e9fe66c 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -213,6 +213,11 @@ IF(NOT CPACK_RPM_PACKAGE_VERSION)
   ENDIF(NOT CPACK_PACKAGE_VERSION)
   SET(CPACK_RPM_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
 ENDIF(NOT CPACK_RPM_PACKAGE_VERSION)
+# Replace '-' in version with '_'
+# '-' character is  an Illegal RPM version character
+# it is illegal because it is used to separate
+# RPM "Version" from RPM "Release"
+STRING(REPLACE "-" "_" CPACK_RPM_PACKAGE_VERSION ${CPACK_RPM_PACKAGE_VERSION})
 
 # CPACK_RPM_PACKAGE_ARCHITECTURE (optional)
 IF(CPACK_RPM_PACKAGE_ARCHITECTURE)

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

Summary of changes:
 Modules/CPackRPM.cmake            |    5 +++++
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake