[Cmake-commits] CMake branch, next, updated. v2.8.4-1023-g7a8a14e

[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  7a8a14e70c4e7b449a558dfd7f7291101528512c (commit)
       via  5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96 (commit)
      from  8dc98c3955255df16a5728a2dedc63907c8a6a26 (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=7a8a14e70c4e7b449a558dfd7f7291101528512c
commit 7a8a14e70c4e7b449a558dfd7f7291101528512c
Merge: 8dc98c3 5b4cbdb
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Feb 25 10:49:17 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 25 10:49:17 2011 -0500

    Merge topic 'CPackRPM-AvoidSpaceInName-Fixbug9932' into next
    
    5b4cbdb CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96
commit 5b4cbdb45e1f0efb2c55b29a4ca2521f38e88f96
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Fri Feb 25 16:47:11 2011 +0100
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Feb 25 16:47:11 2011 +0100

    CPackRPM Replace space in some CPACK_ vars (Fix bug 9932)

diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx
index 2d675c1..cc50580 100644
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@@ -31,6 +31,21 @@ int cmCPackRPMGenerator::InitializeInternal()
     {
     this->SetOption("CPACK_SET_DESTDIR", "I_ON");
     }
+  /* Replace space in CPACK_PACKAGE_NAME in order to avoid
+   * rpmbuild scream on unwanted space in filename issue
+   * Moreover RPM file do not usually embed space in filename
+   */
+  if (this->GetOption("CPACK_PACKAGE_NAME")) {
+    std::string packageName=this->GetOption("CPACK_PACKAGE_NAME");
+    cmSystemTools::ReplaceString(packageName," ","-");
+    this->SetOption("CPACK_PACKAGE_NAME",packageName.c_str());
+  }
+  /* same for CPACK_PACKAGE_FILE_NAME */
+  if (this->GetOption("CPACK_PACKAGE_FILE_NAME")) {
+    std::string packageName=this->GetOption("CPACK_PACKAGE_FILE_NAME");
+    cmSystemTools::ReplaceString(packageName," ","-");
+    this->SetOption("CPACK_PACKAGE_FILE_NAME",packageName.c_str());
+  }
   return this->Superclass::InitializeInternal();
 }
 

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

Summary of changes:
 Source/CPack/cmCPackRPMGenerator.cxx |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake