From 9cae14be56b0c0e0583d99bc9c2254222baad6a0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 19 Apr 2018 00:56:03 +0200
Subject: [PATCH] 3.2-11 spec update.

---
 systemtap.spec | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/systemtap.spec b/systemtap.spec
index 5813c3a..a627eda 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -77,7 +77,7 @@
 
 Name: systemtap
 Version: 3.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 # for version, see also configure.ac
 
 Patch10: rhbz1504009.patch
@@ -99,6 +99,16 @@ Patch14: unwind-ksalr.patch
 # upstream: db9c9d6e30c6cfd7b85475b5c79ee2cc51201934
 Patch15: rhbz1566422.patch
 
+# systemtap depends on removed /bin/env
+# redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1549063
+# upstream: commit d6492e78bd50e923963e3c7aa235100a208f4775
+Patch16: rhbz1549063.patch
+
+# 4.15 kernel updates (__GFP_COLD undeclared)
+# redhat: https://bugzilla.redhat.com/show_bug.cgi?id=1549063
+# upstream: commit 0f8139eb4bd06a19714608b5f246fc24fcafde6e
+Patch17: rhbz1566745.patch
+
 # Packaging abstract:
 #
 # systemtap              empty req:-client req:-devel
@@ -261,7 +271,7 @@ URL: http://sourceware.org/systemtap/
 # kernel variant  (kernel-PAE, kernel-debug, etc.) devel package
 # installed.
 Requires: kernel-devel-uname-r
-#%{?fedora:Suggests: kernel-devel}
+%{?fedora:Suggests: kernel-devel}
 Requires: gcc make
 # Suggest: kernel-debuginfo
 
@@ -502,6 +512,8 @@ cd ..
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 
@@ -1179,6 +1191,11 @@ done
 
 # PRERELEASE
 %changelog
+* Thu Apr 19 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.2-11
+- Add rhbz1549063.patch (/bin/env -> /usr/bin/env)
+- Add rhbz1566745.patch (4.15 kernel tapset updates)
+- Enable accidentially disabled Suggests: kernel-devel again.
+
 * Wed Apr 18 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.2-10
 - Add unwind-fallback.patch
 - rhbz1566422.patch