From 75c2acc64b0036c9393a43b4201d0706eaea4dc9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 22 Aug 2020 14:50:59 -0500 Subject: [PATCH] rpm-macros: Requires: epel-rpm-macros on rhel8 At least until cmake macros are updated in rhel8's cmake, see also https://bugzilla.redhat.com/show_bug.cgi?id=1858941 --- kf5.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index a81a5e2..a176422 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.73.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -27,6 +27,11 @@ Requires: qt5-rpm-macros >= 5.11 Requires: cmake3 Requires: qt5-qtbase-devel >= 5.11 %endif +%if 0%{?rhel} == 8 +# This is where cmake-related macros live, e.g. %%cmake_build, %%cmake_install +# at least until fixed upstream, https://bugzilla.redhat.com/show_bug.cgi?id=1858941 +Requires: epel-rpm-macros +%endif # misc build environment dependencies Requires: gcc-c++ BuildArch: noarch @@ -82,6 +87,9 @@ sed -i \ %changelog +* Sat Aug 22 2020 Rex Dieter - 5.73.0-2 +- rpm-macros: Requires: epel-rpm-macros on rhel8 + * Mon Aug 03 2020 Rex Dieter - 5.73.0-1 - 5.73.0