From f933cf9a70f73560af0ace4422728acd2941705f1c64cc105adbefd55f129bb1 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 15 Jan 2024 14:02:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=319 --- frameworkintegration.spec | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/frameworkintegration.spec b/frameworkintegration.spec index 9173041..54a368f 100644 --- a/frameworkintegration.spec +++ b/frameworkintegration.spec @@ -17,12 +17,11 @@ %define lname libKF5Style5 -%define _tar_path 5.103 # 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: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} -# Only needed for the package signature condition +%define qt5_version 5.15.2 %bcond_without released Name: frameworkintegration Version: 5.114.0 @@ -35,20 +34,19 @@ Source: %{name}-%{version}.tar.xz Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: fdupes -BuildRequires: kf5-filesystem -BuildRequires: cmake(AppStreamQt) >= 0.10.4 -BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5ConfigWidgets) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5I18n) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5IconThemes) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5NewStuff) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5Notifications) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5Package) >= %{_kf5_bugfix_version} -BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Gui) >= 5.15.0 -BuildRequires: cmake(Qt5Widgets) >= 5.15.0 +BuildRequires: (cmake(AppStreamQt5) >= 1.0.0 or cmake(AppStreamQt) < 1.0.0) +BuildRequires: cmake(KF5Config) >= %{_kf5_version} +BuildRequires: cmake(KF5ConfigWidgets) >= %{_kf5_version} +BuildRequires: cmake(KF5I18n) >= %{_kf5_version} +BuildRequires: cmake(KF5IconThemes) >= %{_kf5_version} +BuildRequires: cmake(KF5NewStuff) >= %{_kf5_version} +BuildRequires: cmake(KF5Notifications) >= %{_kf5_version} +BuildRequires: cmake(KF5Package) >= %{_kf5_version} +BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_version} +BuildRequires: cmake(Qt5Gui) >= %{qt5_version} +BuildRequires: cmake(Qt5Widgets) >= %{qt5_version} BuildRequires: cmake(packagekitqt5) %description @@ -85,8 +83,8 @@ Applications do not need to link to this directly. %package devel Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Requires: %{lname} = %{version} -Requires: cmake(KF5ConfigWidgets) >= %{_kf5_bugfix_version} -Requires: cmake(KF5IconThemes) >= %{_kf5_bugfix_version} +Requires: cmake(KF5ConfigWidgets) >= %{_kf5_version} +Requires: cmake(KF5IconThemes) >= %{_kf5_version} %description devel Framework Integration is a set of plugins responsible for better