[Cmake-commits] CMake branch, master, updated. v3.9.1-503-gf59d8e5

[Kitware Robot]

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, master has been updated
       via  f59d8e5982f5716fb912a795ed93f808e4791532 (commit)
       via  48fa4c0d1ad4c754990416e48a6dc00ac2def085 (commit)
      from  a2405b43788787c5c34f9d2b7b005c0ef6c3bb24 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59d8e5982f5716fb912a795ed93f808e4791532
commit f59d8e5982f5716fb912a795ed93f808e4791532
Merge: a2405b4 48fa4c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 16 15:05:06 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Aug 16 11:05:12 2017 -0400

    Merge topic 'CPackRPM-new-debuginfo'
    
    48fa4c0d CPackRPM: Restore old style debuginfo creation for rpm >= 4.14
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1099


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48fa4c0d1ad4c754990416e48a6dc00ac2def085
commit 48fa4c0d1ad4c754990416e48a6dc00ac2def085
Author:     Björn Esser <besser82 at fedoraproject.org>
AuthorDate: Mon Jul 31 16:10:34 2017 +0200
Commit:     Björn Esser <besser82 at fedoraproject.org>
CommitDate: Wed Aug 16 11:21:37 2017 +0200

    CPackRPM: Restore old style debuginfo creation for rpm >= 4.14

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\@

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

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


hooks/post-receive
-- 
CMake