[Cmake-commits] CMake branch, next, updated. v2.8.8-2995-gecb3013

[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  ecb3013ebdda66d3df24a23f95cddafecb43481d (commit)
       via  7321c94e593ff50714d20d99b7042e9f96ee057e (commit)
       via  55cadb68066dfd4dc0c053ff25560adfce9b6d56 (commit)
      from  d0c5cc179acda8a471f7005c004ad029a6dcf468 (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=ecb3013ebdda66d3df24a23f95cddafecb43481d
commit ecb3013ebdda66d3df24a23f95cddafecb43481d
Merge: d0c5cc1 7321c94
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Jun 5 04:26:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 04:26:11 2012 -0400

    Merge topic 'CPackRPM-emptyPerComponentREQUIRES' into next
    
    7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
    55cadb6 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7321c94e593ff50714d20d99b7042e9f96ee057e
commit 7321c94e593ff50714d20d99b7042e9f96ee057e
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Tue Jun 5 10:20:43 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Jun 5 10:20:43 2012 +0200

    CPackRPM: avoid leakage of RPM directive from one component to another.
    
    Fixes #0013248
    Inspired-By: Sergei Golubchik

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index cba746f..ae93512 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -488,7 +488,10 @@ FOREACH(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLIC
       MESSAGE("CPackRPM:Debug: User defined ${_PACKAGE_HEADER_NAME}:\n ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}")
     ENDIF(CPACK_RPM_PACKAGE_DEBUG)
     SET(TMP_RPM_${_RPM_SPEC_HEADER} "${_PACKAGE_HEADER_NAME}: ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP}")
-ENDIF(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+  ELSE(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
+    # Do not forget to unset previously set header (from previous component)
+    UNSET(TMP_RPM_${_RPM_SPEC_HEADER})
+  ENDIF(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP)
 ENDFOREACH(_RPM_SPEC_HEADER)
 
 # CPACK_RPM_SPEC_INSTALL_POST

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

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


hooks/post-receive
-- 
CMake