From 6c9f815259bbedece37c30b4c4003136d2b26a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 09:39:51 +0200 Subject: [PATCH 1/2] Mandatory Perl build-requires added --- qt5-qtbase.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c21f571..ee2212b 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -30,6 +30,7 @@ %if 0%{?fedora} > 23 || 0%{?rhel} > 6 %global journald -journald +BuildRequires: perl-generators BuildRequires: pkgconfig(libsystemd) %endif From c3879d9ba562fb49f3787248fae0c840e5eb279e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 2 Aug 2016 08:15:13 -0500 Subject: [PATCH 2/2] qt5-rpm-macros: Requires: cmake(3) --- qt5-qtbase.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index ee2212b..08ebad0 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd) Summary: Qt5 - QtBase components Name: qt5-qtbase Version: 5.6.1 -Release: 3%{?prerelease:.%{prerelease}}%{?dist} +Release: 4%{?prerelease:.%{prerelease}}%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -137,8 +137,13 @@ Source10: macros.qt5 # RPM drag in gtk2 as a dependency for the GTK+ 2 dialog support. %global __requires_exclude_from ^%{_qt5_plugindir}/platformthemes/.*$ -# for %%check -BuildRequires: cmake +# for %%check, rpm auto-provides +%if 0%{?fedora} +BuildRequires: cmake >= 3 +%endif +%if 0%{?rhel} +BuildRequires: cmake3 +%endif BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: findutils @@ -343,6 +348,12 @@ Summary: RPM macros for Qt5 # https://bugzilla.redhat.com/show_bug.cgi?id=1248174 Requires: redhat-rpm-config %endif +%if 0%{?fedora} +Requires: cmake >= 3 +%endif +%if 0%{?rhel} +Requires: cmake3 +%endif # when qt5-rpm-macros was split out Conflicts: qt5-qtbase-devel < 5.6.0-0.23 BuildArch: noarch @@ -961,6 +972,9 @@ fi %changelog +* Tue Aug 02 2016 Rex Dieter - 5.6.1-4 +- qt5-rpm-macros: Requires: cmake(3) + * Tue Jun 14 2016 Rex Dieter - 5.6.1-3 - backport some xcb-plugin-related fixes