From 9eb42f22d5dd38d575762d9bdca277db0d4b1e61 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 13 Aug 2017 13:22:19 +0200 Subject: [PATCH] Fix compatibility with F-27 debuginfo packaging. Fix compatibility with F-27 librpm version 8. --- gdb.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/gdb.spec b/gdb.spec index 26d95b9..b60fe91 100644 --- a/gdb.spec +++ b/gdb.spec @@ -26,7 +26,7 @@ Version: 8.0 # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL Group: Development/Debuggers @@ -40,6 +40,10 @@ URL: http://gnu.org/software/gdb/ %global gdb_src %{tarname} %global gdb_build build-%{_target_platform} +# error: Installed (but unpackaged) file(s) found: /usr/lib/debug/usr/bin/gdb-gdb.py +# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/PBOJDOFMWTRV3ZOKNV5HN7IBX5EPHDHF/ +%undefine _debuginfo_subpackages + # For DTS RHEL<=7 GDB it is better to use none than a Requires dependency. %if 0%{!?rhel:1} || 0%{?rhel} > 7 Recommends: %{?scl_prefix}gcc-gdb-plugin%{?_isa} @@ -110,9 +114,13 @@ Recommends: default-yama-scope %if 0%{?el7:1} %global librpmver 3 %else +%if 0%{?fedora} >= 27 +%global librpmver 8 +%else %global librpmver 7 %endif %endif +%endif %if 0%{?__isa_bits} == 64 %global librpmname librpm.so.%{librpmver}()(64bit) %else @@ -1635,6 +1643,10 @@ then fi %changelog +* Sun Aug 13 2017 Jan Kratochvil - 8.0-21.fc26 +- Fix compatibility with F-27 debuginfo packaging. +- Fix compatibility with F-27 librpm version 8. + * Thu Aug 3 2017 Jan Kratochvil - 8.0-20.fc26 - Two fixes from upstream stable branch 8.0.