From aacdec2a04901560801242fed1447fbd2e27e1da Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Tue, 23 Aug 2016 09:37:55 +0200
Subject: [PATCH] [dts+el7] [x86*] Bundle libipt - fix#2 its initialization (RH
 BZ 1256513).

---
 gdb-linux_perf-bundle.patch | 5 +++--
 gdb.spec                    | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gdb-linux_perf-bundle.patch b/gdb-linux_perf-bundle.patch
index aeb4f10..c280279 100644
--- a/gdb-linux_perf-bundle.patch
+++ b/gdb-linux_perf-bundle.patch
@@ -208,13 +208,14 @@ Index: gdb-7.11.1/gdb/configure.ac
    if test "$perf_event" != yes; then
 --- gdb-7.11.1/gdb/gdb.c-orig	2016-02-10 04:19:39.000000000 +0100
 +++ gdb-7.11.1/gdb/gdb.c	2016-08-23 09:15:13.169650953 +0200
-@@ -25,6 +25,10 @@ main (int argc, char **argv)
+@@ -25,6 +25,11 @@ main (int argc, char **argv)
  {
    struct captured_main_args args;
  
-+  // RHEL DTS bundle:
++#ifdef PERF_ATTR_SIZE_VER5_BUNDLE
 +  extern void __libipt_init(void);
 +  __libipt_init();
++#endif
 +
    memset (&args, 0, sizeof args);
    args.argc = argc;
diff --git a/gdb.spec b/gdb.spec
index 90b906c..9cba9e5 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.11.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: 81%{?dist}
+Release: 82%{?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
@@ -1457,6 +1457,9 @@ then
 fi
 
 %changelog
+* Tue Aug 23 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11.1-82.fc24
+- [dts+el7] [x86*] Bundle libipt - fix#2 its initialization (RH BZ 1256513).
+
 * Tue Aug 23 2016 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.11.1-81.fc24
 - [dts+el7] [x86*] Bundle libipt - fix its initialization (RH BZ 1256513).