[Cmake-commits] CMake branch, next, updated. v2.8.7-3354-gaa05637

[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  aa056370541417f070a6516d0888a70d24e1a3b7 (commit)
       via  3a0c60d3bf8dab326e7dc409632a70ac63e358c1 (commit)
      from  e26272157599349803ca853abab89bc7c4bc8544 (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=aa056370541417f070a6516d0888a70d24e1a3b7
commit aa056370541417f070a6516d0888a70d24e1a3b7
Merge: e262721 3a0c60d
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Tue Mar 27 15:47:55 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 27 15:47:55 2012 -0400

    Merge topic 'CPackPM-fixAmazonLinux' into next
    
    3a0c60d Override topdir from rpm command line seems necessary on Amazon linux.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a0c60d3bf8dab326e7dc409632a70ac63e358c1
commit 3a0c60d3bf8dab326e7dc409632a70ac63e358c1
Author:     Tom Hughes <tomtheengineer at gmail.com>
AuthorDate: Tue Mar 27 21:43:35 2012 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Tue Mar 27 21:43:35 2012 +0200

    Override topdir from rpm command line seems necessary on Amazon linux.
    
    This modification should be harmless on other distro.
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 442d7c4..cba746f 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -899,6 +899,7 @@ IF(RPMBUILD_EXECUTABLE)
   # Now call rpmbuild using the SPECFILE
   EXECUTE_PROCESS(
     COMMAND "${RPMBUILD_EXECUTABLE}" -bb
+            --define "_topdir ${CPACK_RPM_DIRECTORY}"
             --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"
             "${CPACK_RPM_BINARY_SPECFILE}"
     WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}"

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

Summary of changes:
 Modules/CPackRPM.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake