diff --git a/kf5.spec b/kf5.spec index eca7167..67e5f4c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.68.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Wed Aug 26 2020 Rex Dieter - 5.68.0-3 +- Use something that actually works with el8's cmake-3.11 + * Tue Aug 25 2020 Rex Dieter - 5.68.0-2 - (branch) backport recent cmake changes from fedora diff --git a/macros.kf5 b/macros.kf5 index 0d82645..9ee8789 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -23,9 +23,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ - %{__cmake} \\\ - %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\ - %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\ + %{!?__cmake_in_source_build:%__cmake_configure}%{?__cmake_in_source_build:%__cmake} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\