summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-08-16 15:05:06 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-08-16 15:05:12 (GMT)
commitf59d8e5982f5716fb912a795ed93f808e4791532 (patch)
tree8203251a62ac458b8ddef980751a02e8ca4e1297
parenta2405b43788787c5c34f9d2b7b005c0ef6c3bb24 (diff)
parent48fa4c0d1ad4c754990416e48a6dc00ac2def085 (diff)
downloadCMake-f59d8e5982f5716fb912a795ed93f808e4791532.zip
CMake-f59d8e5982f5716fb912a795ed93f808e4791532.tar.gz
CMake-f59d8e5982f5716fb912a795ed93f808e4791532.tar.bz2
Merge topic 'CPackRPM-new-debuginfo'
48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1099
-rw-r--r--Modules/CPackRPM.cmake12
1 files changed, 10 insertions, 2 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index fa2a6e4..3913494 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -2422,7 +2422,11 @@ mv *.rpm %_rpmdir"
set(RPMBUILD_FLAGS "-bs")
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
- "# -*- rpm-spec -*-
+ "# Restore old style debuginfo creation for rpm >= 4.14.
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+
+# -*- rpm-spec -*-
BuildRoot: %_topdir/\@CPACK_PACKAGE_FILE_NAME\@
Summary: \@CPACK_RPM_PACKAGE_SUMMARY\@
Name: \@CPACK_RPM_PACKAGE_NAME\@
@@ -2527,7 +2531,11 @@ Vendor: \@CPACK_RPM_PACKAGE_VENDOR\@
if(CPACK_RPM_GENERATE_USER_BINARY_SPECFILE_TEMPLATE OR NOT CPACK_RPM_USER_BINARY_SPECFILE)
file(WRITE ${CPACK_RPM_BINARY_SPECFILE}.in
- "# -*- rpm-spec -*-
+ "# Restore old style debuginfo creation for rpm >= 4.14.
+%undefine _debugsource_packages
+%undefine _debuginfo_subpackages
+
+# -*- rpm-spec -*-
BuildRoot: %_topdir/\@CPACK_PACKAGE_FILE_NAME\@\@CPACK_RPM_PACKAGE_COMPONENT_PART_PATH\@
Summary: \@CPACK_RPM_PACKAGE_SUMMARY\@
Name: \@CPACK_RPM_PACKAGE_NAME\@