[Cmake-commits] CMake branch, next, updated. v2.8.3-836-g09c5aa7

[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  09c5aa789ce9aef2337c25ab4c56133b0bf9c802 (commit)
       via  8d366cd1ebc2a5937a40c4b44074852e3f7e7fae (commit)
      from  1306474331ecf15bc048a4d0aff53f4f6ac4632d (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=09c5aa789ce9aef2337c25ab4c56133b0bf9c802
commit 09c5aa789ce9aef2337c25ab4c56133b0bf9c802
Merge: 1306474 8d366cd
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Dec 13 14:16:28 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 13 14:16:28 2010 -0500

    Merge topic 'CPackRPM-Fix0011595' into next
    
    8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d366cd1ebc2a5937a40c4b44074852e3f7e7fae
commit 8d366cd1ebc2a5937a40c4b44074852e3f7e7fae
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Dec 13 20:11:06 2010 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Dec 13 20:11:06 2010 +0100

    CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...)

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index ab909f4..026c45a 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -566,10 +566,9 @@ mv $RPM_BUILD_ROOT \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\"
 %install
 if [ -e $RPM_BUILD_ROOT ];
 then
-  mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/*\" $RPM_BUILD_ROOT
-else
-  mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT
+  rm -rf $RPM_BUILD_ROOT
 fi
+mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT
 
 %clean
 

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

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


hooks/post-receive
-- 
CMake