From 58b87beb031e0d67f90139561bef6fd211f182fc Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Tue, 30 Jan 2018 09:00:28 -0600
Subject: [PATCH] Patch to use correct C inline function semantics to fix FTBFS
 (BZ#1424417) Cleanup spec file conditionals

---
 sbd-static-inline.patch | 12 ++++++++++++
 sbd.spec                | 11 ++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 sbd-static-inline.patch

diff --git a/sbd-static-inline.patch b/sbd-static-inline.patch
new file mode 100644
index 0000000..3417996
--- /dev/null
+++ b/sbd-static-inline.patch
@@ -0,0 +1,12 @@
+diff -ru ../sbd-1ee3503cbc52b73876b6aae5471d3b6f7c092bf5.unpatched/src/sbd-inquisitor.c ./src/sbd-inquisitor.c
+--- ../sbd-1ee3503cbc52b73876b6aae5471d3b6f7c092bf5.unpatched/src/sbd-inquisitor.c	2018-01-30 08:37:52.297629808 -0600
++++ ./src/sbd-inquisitor.c	2018-01-30 08:38:37.062571258 -0600
+@@ -167,7 +167,7 @@
+ 	}
+ }
+ 
+-inline void cleanup_servant_by_pid(pid_t pid)
++static inline void cleanup_servant_by_pid(pid_t pid)
+ {
+ 	struct servants_list_item* s;
+ 
diff --git a/sbd.spec b/sbd.spec
index 88150d7..75c6881 100644
--- a/sbd.spec
+++ b/sbd.spec
@@ -18,7 +18,7 @@
 %global commit 1ee3503cbc52b73876b6aae5471d3b6f7c092bf5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global github_owner beekhof
-%global buildnum 3
+%global buildnum 4
 
 Name:           sbd
 Summary:        Storage-based death
@@ -26,7 +26,7 @@ License:        GPLv2+
 Group:          System Environment/Daemons
 Version:        1.2.1
 #Release:        0.%{buildnum}.%{shortcommit}.git%{?dist}
-Release:        %{buildnum}%{?dist}.4
+Release:        %{buildnum}%{?dist}
 Url:            https://github.com/%{github_owner}/%{name}
 Source0:        https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -46,8 +46,9 @@ Patch1:         sbd-no-storage-option.patch
 Patch2:         sbd-local-debug.patch
 Patch3:         sbd-pcmk-health.patch
 Patch4:         sbd-proc-pid.patch
+Patch5:         sbd-static-inline.patch
 
-%if 0%{?rhel} > 0
+%if 0%{?rhel} && 0%{?rhel} <= 7
 ExclusiveArch: i686 x86_64 s390x
 %endif
 
@@ -115,6 +116,10 @@ rm -rf %{buildroot}
 %doc COPYING
 
 %changelog
+* Tue Jan 30 2018 Merlin Mathesius <mmathesi@redhat.com> - 1.2.1-4
+- Patch to use correct C inline function semantics to fix FTBFS (BZ#1424417)
+  Cleanup spec file conditionals
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild