diff options
author | David Cole <david.cole@kitware.com> | 2011-09-07 19:38:27 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-07 19:38:27 (GMT) |
commit | de62fd1b6d268702473b3307f48eb4cefb8c2c5d (patch) | |
tree | 8a25b83e6d9434571433c87bc19b35cb12dd8309 | |
parent | db4154661cfa1baf2596ce4c68ac8a328690245d (diff) | |
parent | b0f6a975870ab37a74557252908e91acfecbc59d (diff) | |
download | CMake-de62fd1b6d268702473b3307f48eb4cefb8c2c5d.zip CMake-de62fd1b6d268702473b3307f48eb4cefb8c2c5d.tar.gz CMake-de62fd1b6d268702473b3307f48eb4cefb8c2c5d.tar.bz2 |
Merge topic 'CPackRPM-fix12366'
b0f6a97 CPack fix #12366 components RPM packages have the same package name
-rw-r--r-- | Modules/CPackRPM.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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\@ |