[Cmake-commits] CMake branch, next, updated. v2.8.5-1816-gf29a0c1

[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  f29a0c14b6a958f584e5af0c3848f943b02e73b0 (commit)
       via  b0f6a975870ab37a74557252908e91acfecbc59d (commit)
      from  e680b6782370941ad05359287466639e3439a2b9 (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=f29a0c14b6a958f584e5af0c3848f943b02e73b0
commit f29a0c14b6a958f584e5af0c3848f943b02e73b0
Merge: e680b67 b0f6a97
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Mon Sep 5 14:24:33 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 5 14:24:33 2011 -0400

    Merge topic 'CPackRPM-fix12366' into next
    
    b0f6a97 CPack  fix #12366 components RPM packages have the same package name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0f6a975870ab37a74557252908e91acfecbc59d
commit b0f6a975870ab37a74557252908e91acfecbc59d
Author:     Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Mon Sep 5 20:22:00 2011 +0200
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Mon Sep 5 20:22:00 2011 +0200

    CPack  fix #12366 components RPM packages have the same package name
    
    fix based on the patch provided by winfriedd

diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index 729d8df..5826542 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -569,7 +569,7 @@ IF(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY
       "# -*- rpm-spec -*-
 BuildRoot:      \@CPACK_RPM_DIRECTORY\@/\@CPACK_PACKAGE_FILE_NAME\@\@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH\@
 Summary:        \@CPACK_RPM_PACKAGE_SUMMARY\@
-Name:           \@CPACK_RPM_PACKAGE_NAME\@
+Name:           \@CPACK_RPM_PACKAGE_NAME\@\@CPACK_RPM_PACKAGE_COMPONENT_PART_NAME\@
 Version:        \@CPACK_RPM_PACKAGE_VERSION\@
 Release:        \@CPACK_RPM_PACKAGE_RELEASE\@
 License:        \@CPACK_RPM_PACKAGE_LICENSE\@

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

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


hooks/post-receive
-- 
CMake