From 7884360378b567ac4f026e634245134c79b4e484a68bf5da7b4e5899df8edea6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 09:58:07 +0000 Subject: [PATCH] Changes for KUF-KF5 syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=155 --- frameworkintegration.spec | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 81c0e39..99c1a48 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -18,22 +18,27 @@ %define lname libKF5Style5 %define _tar_path 5.38 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%define kf5_version %{version} Name: frameworkintegration Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kconfig-devel >= %{_tar_path} -BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: knotifications-devel >= %{_tar_path} -BuildRequires: kpackage-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: knotifications-devel >= %{_kf5_bugfix_version} +BuildRequires: kpackage-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} %if 0%{?suse_version} >= 1330 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) BuildRequires: cmake(AppStreamQt) >= 0.10.4 %endif @@ -91,8 +96,8 @@ Summary: Plugins responsible for better integration of Qt applications in Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kconfigwidgets-devel >= %{_tar_path} -Requires: kiconthemes-devel >= %{_tar_path} +Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +Requires: kiconthemes-devel >= %{_kf5_bugfix_version} %description devel Framework Integration is a set of plugins responsible for better