From 106f1e3b221aaab21e8ec609300fcc9fa62596b9dc5873a933fe021c972a8a4a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 7 Aug 2019 12:43:51 +0000 Subject: [PATCH] Cleanup: - Don't lower minimum Qt version anymore - Drop patches for Qt 5.9 - Drop patches for Leap 42.x - Drop conditionals for no longer supported distribution versions OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=208 --- kactivities5.changes | 6 ++++++ kactivities5.spec | 9 +-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/kactivities5.changes b/kactivities5.changes index 624265f..a447bcc 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 19 11:38:09 UTC 2019 - Wolfgang Bauer + +- Don't lower minimum Qt version anymore, it requires 5.11 now +- Drop conditionals for no longer supported distribution versions + ------------------------------------------------------------------- Sun Jul 14 06:41:37 UTC 2019 - lbeltrame@kde.org diff --git a/kactivities5.spec b/kactivities5.spec index 1fb1bf6..06dfa06 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -35,6 +35,7 @@ BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem +BuildRequires: libboost_headers-devel BuildRequires: xz BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} @@ -46,11 +47,6 @@ BuildRequires: cmake(Qt5Qml) >= 5.6.0 BuildRequires: cmake(Qt5Quick) >= 5.6.0 BuildRequires: cmake(Qt5Sql) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif %description Kactivities provides an API for using and interacting with the Plasma Activities Manager. @@ -91,9 +87,6 @@ Development files. %prep %setup -q -n kactivities-%{version} -%if 0%{?suse_version} == 1500 -sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt -%endif %build %cmake_kf5 -d build