From cbbceab946c4e5f596957e29f2ab4ef5ed967c16c8da5ea13cd612cda5d6802f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 23 Feb 2018 05:49:32 +0000 Subject: [PATCH] Accepting request 578928 from home:alois:branches:KDE:Extra - Switched build to Qt5 for TW and Leap 15 OBS-URL: https://build.opensuse.org/request/show/578928 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kst?expand=0&rev=10 --- kst.changes | 5 +++++ kst.spec | 35 ++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/kst.changes b/kst.changes index 77f1821..ee74f99 100644 --- a/kst.changes +++ b/kst.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 08:29:11 UTC 2018 - aloisio@gmx.com + +- Switched build to Qt5 for TW and Leap 15 + ------------------------------------------------------------------- Thu Aug 4 21:46:34 UTC 2016 - wbauer@tmo.at diff --git a/kst.spec b/kst.spec index 130c572..b1418ee 100644 --- a/kst.spec +++ b/kst.spec @@ -1,7 +1,7 @@ # # spec file for package kst # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Christian Trippe ctrippe@opensuse.org # # All modifications and additions to the file contributed by third parties @@ -35,14 +35,25 @@ BuildRequires: getdata-devel BuildRequires: gsl-devel BuildRequires: libcfitsio-devel BuildRequires: libmatio-devel -BuildRequires: libnetcdf_c++-devel -BuildRequires: libqt4-devel -BuildRequires: netcdf-devel BuildRequires: libnetcdf +BuildRequires: libnetcdf_c++-devel +BuildRequires: netcdf-devel BuildRequires: readline-devel BuildRequires: update-desktop-files Requires: libnetcdf Obsoletes: python-kst < %{version} +%if 0%{?suse_version} >= 1500 +BuildRequires: libqt5-linguist +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +%else +BuildRequires: libqt4-devel +%endif %description Kst is a data plotting and viewing program. Some of the features include: @@ -62,7 +73,16 @@ Kst is a data plotting and viewing program. Some of the features include: Summary: Development files for %{name} Group: Development/Libraries/KDE Requires: %{name} = %{version} +%if 0%{?suse_version} >= 1500 +Requires: pkgconfig(Qt5Concurrent) +Requires: pkgconfig(Qt5Core) +Requires: pkgconfig(Qt5Network) +Requires: pkgconfig(Qt5PrintSupport) +Requires: pkgconfig(Qt5Widgets) +Requires: pkgconfig(Qt5Xml) +%else Requires: libqt4-devel +%endif %description devel Development libraries and headers needed to build software @@ -78,7 +98,12 @@ EXTRA_FLAGS="-Dkst_install_prefix=/usr \ -Dkst_install_libdir=%{_lib} \ -Dkst_release=1 \ -Dkst_dbgsym=1 \ - -Dkst_python=0" + -Dkst_python=0 \ +%if 0%{?suse_version} >= 1500 + -Dkst_qt5=1" +%else + -Dkst_qt4=1" +%endif cmake $EXTRA_FLAGS make %{?_smp_mflags}