From 0658ed3bcb374dee6a69e94a05c2b8f518e39ed7 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 19 Aug 2020 20:43:34 +0000 Subject: [PATCH] fix rpm-macros for RHEL builds --- qt5.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt5.spec b/qt5.spec index bad529e..2d2837a 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,4 +1,3 @@ - # include qt5,qt5-devel metapackages or not # dropped for f32+ %if 0%{?fedora} < 32 @@ -82,7 +81,12 @@ Requires: qt5-qtxmlpatterns-devel %package rpm-macros Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages Conflicts: qt5-qtbase-devel < 5.6.0-0.23 +%if 0%{?fedora} || 0%{?rhel} >= 8 Requires: cmake >= 3 +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 +Requires: cmake3 +%endif Requires: gcc-c++ %description rpm-macros %{summary}. @@ -138,7 +142,7 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %changelog * Wed Aug 19 2020 Troy Dawson - 5.14.2-5 -- rpm-macros always requires cmake +- fix rpm-macros for RHEL builds * Wed Jul 29 2020 Fedora Release Engineering - 5.14.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild