From ea875e82a56d9c9beb0d65a1c4091d50186ab0cefca1a3d4d8db72afe3f23a3b Mon Sep 17 00:00:00 2001 From: Luca Beltrame <lbeltrame@kde.org> Date: Wed, 13 Sep 2017 12:19:42 +0000 Subject: [PATCH] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdeclarative?expand=0&rev=146 --- kdeclarative.spec | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/kdeclarative.spec b/kdeclarative.spec index 5785031..d003792 100644 --- a/kdeclarative.spec +++ b/kdeclarative.spec @@ -19,6 +19,10 @@ %bcond_without lang %define lname libKF5Declarative5 %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}')} Name: kdeclarative Version: 5.38.0 Release: 0 @@ -30,19 +34,19 @@ Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf 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: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= %{_tar_path} -BuildRequires: kguiaddons-devel >= %{_tar_path} -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kpackage-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kglobalaccel-devel >= %{_kf5_bugfix_version} +BuildRequires: kguiaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kpackage-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: libepoxy-devel BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5Gui) >= 5.6.0 @@ -101,9 +105,9 @@ Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: %{name}-components = %{version} Requires: extra-cmake-modules -Requires: kconfig-devel >= %{_tar_path} -Requires: kcoreaddons-devel >= %{_tar_path} -Requires: kpackage-devel >= %{_tar_path} +Requires: kconfig-devel >= %{_kf5_bugfix_version} +Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} +Requires: kpackage-devel >= %{_kf5_bugfix_version} Requires: libKF5CalendarEvents5 = %{version} Requires: libKF5QuickAddons5 = %{version} Requires: cmake(Qt5Qml) >= 5.6.0