From 6d1599f359431c5eb6593a0a0bd1f51a5090550a Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 13 May 2015 21:59:17 +0200 Subject: [PATCH] Rebase to FSF GDB 7.9.1 (7.9 stable branch). - Add 'Recommends: dnf-plugins-core' for 'dnf debuginfo-install'. --- .gitignore | 2 +- gdb.spec | 15 +++++++++++++-- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c07b428..54bd832 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /gdb-libstdc++-v3-python-r155978.tar.bz2 -/gdb-7.9.tar.xz +/gdb-7.9.1.tar.xz diff --git a/gdb.spec b/gdb.spec index 291c84f..e3b2c06 100644 --- a/gdb.spec +++ b/gdb.spec @@ -22,11 +22,11 @@ Name: %{?scl_prefix}gdb # See timestamp of source gnulib installed into gdb/gnulib/ . %global snapgnulib 20121213 %global tarname gdb-%{version} -Version: 7.9 +Version: 7.9.1 # 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: 11%{?dist} +Release: 12%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain and GFDL Group: Development/Debuggers @@ -68,8 +68,15 @@ Provides: bundled(binutils) = %{snapsrc} # https://fedorahosted.org/fpc/ticket/130 Provides: bundled(md5-gcc) = %{snapsrc} +%if 0%{!?rhel:1} || 0%{?rhel} > 7 Recommends: gcc-gdb-plugin%{?_isa} +# /usr/lib/python2.7/site-packages/dnf-plugins/debuginfo-install.py +# [RFE] Define virtual provides for DNF commands and suggest installing the appropriate one if a command was not found +# https://bugzilla.redhat.com/show_bug.cgi?id=1208773 +Recommends: dnf-plugins-core +%endif + # GDB patches have the format `gdb--bz-.patch'. # They should be created using patch level 1: diff -up ./gdb (or gdb-6.3/gdb). @@ -1324,6 +1331,10 @@ then fi %changelog +* Wed May 13 2015 Jan Kratochvil - 7.9.1-12.fc22 +- Rebase to FSF GDB 7.9.1 (7.9 stable branch). +- Add 'Recommends: dnf-plugins-core' for 'dnf debuginfo-install'. + * Thu Apr 2 2015 Jan Kratochvil - 7.9-11.fc22 - Suggest s/debuginfo-install/dnf debuginfo-install/ (BZ 1208650, Omair Majid). diff --git a/sources b/sources index 7270f4a..2f67f82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4981307aa9619bbec5b73261e4e41c8d gdb-libstdc++-v3-python-r155978.tar.bz2 -e6279f26559d839f0b4218a482bcb43e gdb-7.9.tar.xz +35374c77a70884eb430c97061053a36e gdb-7.9.1.tar.xz