[Cmake-commits] CMake branch, next, updated. v2.8.2-990-g5f97704

Eric Noulard eric.noulard at gmail.com
Sun Oct 3 17:31:58 EDT 2010


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  5f97704a7a4eef48e7386a59d0db846324c03f67 (commit)
       via  4a4a53f3dd9a49efa95119a4c38b25c2ff77476d (commit)
       via  ef4263aad77cee19f99e069bca5d53439a8706ad (commit)
       via  2488c343f1c79e8fa598a1ba33fe347fcf7b2017 (commit)
       via  d69b129481ac9afd41d609eef0001bdb712201c8 (commit)
      from  ab9a029fd8e9b73b8015007d48c73fc70263f658 (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=5f97704a7a4eef48e7386a59d0db846324c03f67
commit 5f97704a7a4eef48e7386a59d0db846324c03f67
Merge: ab9a029 4a4a53f
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sun Oct 3 17:31:57 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Oct 3 17:31:57 2010 -0400

    Merge topic 'CPackHandleParenthesisInSystemName' into next
    
    4a4a53f CPackRPM  Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
    ef4263a KWSys Nightly Date Stamp
    2488c34 KWSys Nightly Date Stamp
    d69b129 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a4a53f3dd9a49efa95119a4c38b25c2ff77476d
commit 4a4a53f3dd9a49efa95119a4c38b25c2ff77476d
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Oct 3 23:29:34 2010 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Oct 3 23:29:34 2010 +0200

    CPackRPM  Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
    
    merge patch from Frank Stappers

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 3ade3aa..e2d7880 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -548,16 +548,16 @@ Vendor:         \@CPACK_RPM_PACKAGE_VENDOR\@
 # We do only save CPack installed tree in _prepr
 # and then restore it in build.
 %prep
-mv $RPM_BUILD_ROOT \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot
+mv $RPM_BUILD_ROOT \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\"
 
 #p build
 
 %install
 if [ -e $RPM_BUILD_ROOT ];
 then
-  mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/* $RPM_BUILD_ROOT
+  mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot/*\" $RPM_BUILD_ROOT
 else
-  mv \@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot $RPM_BUILD_ROOT
+  mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT
 fi
 
 %clean

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list