From cdbf467ed0715ad82439ed9268cf31fe365144a5 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Tue, 14 Sep 2021 08:42:12 -0500
Subject: [PATCH] Use make macros and %set_build_flags

---
 dlm.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlm.spec b/dlm.spec
index cc83eef..1de94a4 100644
--- a/dlm.spec
+++ b/dlm.spec
@@ -1,6 +1,6 @@
 Name:           dlm
 Version:        4.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        GPLv2 and GPLv2+ and LGPLv2+
 # For a breakdown of the licensing, see README.license
 Summary:        Kernel Distributed Lock Manager control daemon and tool
@@ -22,7 +22,7 @@ ExclusiveArch: i686 x86_64
 %endif
 
 Requires:       %{name}-lib = %{version}-%{release}
-Requires:       corosync >= 1.99.9
+Requires:       corosync >= 3.1.0
 %{?fedora:Requires: kernel-modules-extra}
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -38,13 +38,13 @@ The kernel dlm requires a user daemon to control membership.
 
 %build
 # upstream does not require configure
-# upstream does not support _smp_mflags
-CFLAGS=$RPM_OPT_FLAGS make
-CFLAGS=$RPM_OPT_FLAGS make -C fence
+# upstream does not support parallel builds
+%set_build_flags
+%make_build -j1
+%make_build -j1 -C fence
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
+%make_install LIBDIR=%{_libdir}
 make -C fence install LIBDIR=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
 
 install -Dm 0644 init/dlm.service %{buildroot}%{_unitdir}/dlm.service
@@ -99,6 +99,9 @@ developing applications that use %{name}.
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Sep 14 2021 Timm Bäder <tbaeder@redhat.com> - 4.1.0-5
+- Use make macros and %%set_build_flags to propagate all build flags
+
 * Mon Aug 02 2021 David Teigland <teigland@redhat.com> - 4.1.0-4
 - fix pacemaker headers