From 6d882351c9fbf0f917195169128c3ee3698680be Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Tue, 14 Jul 2020 14:43:16 -0700
Subject: [PATCH] clean up cmake macro diffs

---
 kf5.spec   | 4 ++--
 macros.kf5 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kf5.spec b/kf5.spec
index 2ef525f..cd745bc 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -51,8 +51,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown}
 install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 sed -i \
   -e "s|@@KF5_VERSION@@|%{version}|g" \
-%if 0%{?rhel} && 0%{?rhel} > 7
-  -e 's|%{?fedora:%{__cmake}}%{?rhel:%{__cmake3}}|  %{__cmake}|' \
+%if 0%{?rhel} && 0%{?rhel} < 8
+  -e 's|%{__cmake}|%{__cmake3}|' \
 %endif
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 
diff --git a/macros.kf5 b/macros.kf5
index 3104569..0c23cc7 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -22,7 +22,7 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\
+    %{__cmake} \\\
     %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\
     %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\
     -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\