summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric NOULARD <eric.noulard@gmail.com>2011-09-05 18:22:00 (GMT)
committerEric NOULARD <eric.noulard@gmail.com>2011-09-05 18:22:00 (GMT)
commitb0f6a975870ab37a74557252908e91acfecbc59d (patch)
treeac4746b2e2dec16608b5241a699b53190260dd4d
parent48ba9b2f197cde7f309b9ef3770e1bf003a7e8e8 (diff)
downloadCMake-b0f6a975870ab37a74557252908e91acfecbc59d.zip
CMake-b0f6a975870ab37a74557252908e91acfecbc59d.tar.gz
CMake-b0f6a975870ab37a74557252908e91acfecbc59d.tar.bz2
CPack fix #12366 components RPM packages have the same package name
fix based on the patch provided by winfriedd
-rw-r--r--Modules/CPackRPM.cmake2
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\@