clean up cmake macro diffs

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
+%if 0%{?rhel} && 0%{?rhel} < 8
-  -e 's|%{?fedora:%{__cmake}}%{?rhel:%{__cmake3}}|  %{__cmake}|' \
+  -e 's|%{__cmake}|%{__cmake3}|' \
 %endif
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 

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" \\\