diff --git a/kaidan.spec b/kaidan.spec index a439173..4801192 100644 --- a/kaidan.spec +++ b/kaidan.spec @@ -16,6 +16,9 @@ # +%define kf6_version 6.6.0 +%define qt6_version 6.6.0 + Name: kaidan Version: 0.11.0 Release: 0 @@ -27,46 +30,45 @@ Source1: https://download.kde.org/unstable/%{name}/%{version}/%{name}-%{v Source2: kaidan.keyring # PATCH-FIX-UPSTREAM: https://invent.kde.org/network/kaidan/-/merge_requests/1328 Patch0: drop_quick_compiler_option.patch -BuildRequires: cmake >= 3.16 -BuildRequires: kf6-extra-cmake-modules >= 6.6.0 +BuildRequires: fdupes +BuildRequires: kf6-extra-cmake-modules >= %{qt6_version} # Both Qt 5 and Qt 6 flavors use the same cmake config name, use the -devel package name # BuildRequires: cmake(KQuickImageEditor) BuildRequires: kquickimageeditor6-devel -BuildRequires: fdupes BuildRequires: pkgconfig -BuildRequires: qt6-declarative-tools >= 6.6.0 -BuildRequires: cmake(KF6CoreAddons) >= 6.6.0 -BuildRequires: cmake(KF6Crash) -BuildRequires: cmake(KF6KIO) >= 6.6.0 -BuildRequires: cmake(KF6Kirigami2) >= 6.6.0 +BuildRequires: qt6-declarative-tools >= %{qt6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} BuildRequires: cmake(KF6KirigamiAddons) >= 1.4.0 -BuildRequires: cmake(KF6Notifications) -BuildRequires: cmake(KF6Prison) -BuildRequires: cmake(KF6QQC2DesktopStyle) +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} +BuildRequires: cmake(KF6Prison) >= %{kf6_version} +BuildRequires: cmake(KF6QQC2DesktopStyle) >= %{kf6_version} BuildRequires: cmake(QXmppQt6) >= 1.9.0 -BuildRequires: cmake(Qt6Concurrent) -BuildRequires: cmake(Qt6Core) >= 6.6.0 -BuildRequires: cmake(Qt6LinguistTools) -BuildRequires: cmake(Qt6Location) -BuildRequires: cmake(Qt6Multimedia) -BuildRequires: cmake(Qt6Positioning) -BuildRequires: cmake(Qt6Qml) -BuildRequires: cmake(Qt6Quick) -BuildRequires: cmake(Qt6QuickControls2) -BuildRequires: cmake(Qt6Sql) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6Xml) +BuildRequires: cmake(Qt6Concurrent) >= %{qt6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6LinguistTools) >= %{qt6_version} +BuildRequires: cmake(Qt6Location) >= %{qt6_version} +BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version} +BuildRequires: cmake(Qt6Positioning) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Sql) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Xml) >= %{qt6_version} BuildRequires: cmake(ZXing) >= 1.0.8 -BuildRequires: pkgconfig(icu-uc) -Requires: kf6-kirigami-imports >= 6.6.0 -Requires: kf6-prison-imports +BuildRequires: pkgconfig(icu-uc) >= 61.0 +Requires: kf6-kirigami-imports >= %{kf6_version} +Requires: kf6-prison-imports >= %{kf6_version} Requires: kirigami-addons6 >= 1.4.0 Requires: kquickimageeditor6-imports -Requires: qt6-declarative-imports -Requires: qt6-location -Requires: qt6-multimedia-imports -Requires: qt6-positioning-imports +Requires: qt6-declarative-imports >= %{qt6_version} +Requires: qt6-location >= %{qt6_version} +Requires: qt6-multimedia-imports >= %{qt6_version} +Requires: qt6-positioning-imports >= %{qt6_version} +Requires: qt6-sql-sqlite >= %{qt6_version} %description Kaidan is a simple Jabber/XMPP client providing a user-interface using @@ -79,7 +81,8 @@ using the qxmpp XMPP client library and Qt 6. %autosetup -p1 %build -%cmake_kf6 '-DI18N:BOOL=ON' +%cmake_kf6 + %kf6_build %install