From 662bd4a9f9dd0475cc6feb69aed859f42700e8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
Date: Thu, 16 Apr 2020 22:00:38 +0200
Subject: [PATCH] Use macros where appropriate

---
 emacs.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/emacs.spec b/emacs.spec
index 3d2b9d8..e5a4c55 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -28,7 +28,7 @@ Source10:      %{name}.appdata.xml
 Patch1:        emacs-spellchecker.patch
 Patch2:        emacs-system-crypto-policies.patch
 
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: atk-devel
 BuildRequires: cairo-devel
 BuildRequires: freetype-devel
@@ -229,7 +229,8 @@ ln -s ../../%{name}/%{version}/etc/NEWS doc
 
 
 %build
-export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
+export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}"
+%set_build_flags
 
 # Build GTK+ binary
 mkdir build-gtk && cd build-gtk
@@ -241,7 +242,7 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
            --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
            --with-xwidgets --with-modules
 make bootstrap
-%{setarch} make %{?_smp_mflags}
+%{setarch} %make_build
 cd ..
 
 # Build Lucid binary
@@ -254,14 +255,14 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
            --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
            --with-modules
 make bootstrap
-%{setarch} make %{?_smp_mflags}
+%{setarch} %make_build
 cd ..
 
 # Build binary without X support
 mkdir build-nox && cd build-nox
 ln -s ../configure .
 %configure --with-x=no --with-modules
-%{setarch} make %{?_smp_mflags}
+%{setarch} %make_build
 cd ..
 
 # Remove versioned file so that we end up with .1 suffix and only one DOC file