From c1ada6e93963d78f49708f2748df8892fcc558dc03c57995edf638f4b35ba878 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 30 Aug 2017 23:34:31 +0000 Subject: [PATCH] - Enable QT5 builds for Factory (suse_version > 1320); (bsc#1056477). OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=57 --- pcp.changes | 5 +++++ pcp.spec | 20 +++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/pcp.changes b/pcp.changes index b8198d0..a31f124 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 30 23:30:36 UTC 2017 - ddiss@suse.com + +- Enable QT5 builds for Factory (suse_version > 1320); (bsc#1056477). + ------------------------------------------------------------------- Wed Aug 30 12:38:58 UTC 2017 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index abaf05c..ff9d150 100644 --- a/pcp.spec +++ b/pcp.spec @@ -173,6 +173,10 @@ Patch9: 0009-pmsnap-control-var-www-srv-www.patch # Qt development and runtime environment missing components before el6 %if 0%{?rhel} == 0 || 0%{?rhel} > 5 %global disable_qt 0 +# We need qt5 for fedora and openSUSE / SLE factory +%if 0%{?fedora} != 0 || 0%{?suse_version} > 1320 +%global default_qt 5 +%endif %else %global disable_qt 1 %endif @@ -280,12 +284,22 @@ BuildRequires: systemd-devel %endif %if !%{disable_qt} BuildRequires: desktop-file-utils +%if 0%{?default_qt} != 5 %if 0%{?suse_version} BuildRequires: libqt4-devel >= 4.4 -%else +%else # suse_version BuildRequires: qt4-devel >= 4.4 -%endif -%endif +%endif # suse_version +%else # default_qt +%if 0%{?suse_version} +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +%else # suse_version +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtsvg-devel +%endif # suse_version +%endif # default_qt +%endif # !disable_qt %if !%{disable_selinux} Requires: pcp-selinux = %{version}-%{release} %endif