diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/ksirk-23.08.4.tar.xz b/ksirk-23.08.4.tar.xz deleted file mode 100644 index 3df9381..0000000 --- a/ksirk-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbbbf56b53566855c24ac99448658be72e694b4c8283f80851d87d80763c9e15 -size 7079372 diff --git a/ksirk-23.08.4.tar.xz.sig b/ksirk-23.08.4.tar.xz.sig deleted file mode 100644 index 3421406..0000000 --- a/ksirk-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu750ACgkQu0YzUNbv -Me/dlg//UoNHzjX/6btVDOa2TsMnZJ2vRs2001zBCQYn/o/Sflsvz4KcaPv6KA6n -VjlCHgd11NBPl5iZ7u5h7mEzQnBu3syzxt/sD4DPnSTDTxYqnvCJr79jGL2HYPP/ -FLGu7NZuu1ARTf437Nb++mh0inMH/O4F9iTZFFAN610c71bX23rRbqbibgKeCGiZ -sYpGgbf4dc4BKeUbrL0quTqBgAWkKn5hzzDQ/hunGXO1vDFZXmC54JNfjuInNJsR -hbXBilewhIWwumSPKNTfVWK8X/X2ofAKf5HNlR1JtRHn/we2hR7zLngbY+1Amj/k -XXx06+aYcGApviV9ou1PkPmglTY94MWzKEsXcox/O1kIWWEIKaTdpe9OatJ8oG6H -7v5eDE0HA4gMUUtggPqAimwRL74Q+V21VHnZhPRAk9/m9Byg4Lxxr692H2i2gIfd -XiI4TgpOuBWbSbhfrD0Kjdo60cmvnR5lKf+ENjBMy5gum9HzOi2/MrGhCLzEkqgO -PLo9V85wNTspMl+Z++9QFOUi8lJsd1b8uIvNZavh6Sv/ZuJGROzVtrJEbGMNw8h0 -q62dFktN7xNipGZJGKzJ9x4vZVMBVb4KBezsxh9AbW+B+WSHx7u0aDxdb2KjnuNY -PHLiY8WW/OLK+k4d+HEuuBJe0kM4ynl6XyOzyYMRwnfWeV1cKUY= -=lMis ------END PGP SIGNATURE----- diff --git a/ksirk-24.01.95.tar.xz b/ksirk-24.01.95.tar.xz new file mode 100644 index 0000000..eaa7b4b --- /dev/null +++ b/ksirk-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7327fcee018c76864f4f2d7f49992e799482ce49702ff407959d808cb9ad11c +size 7077292 diff --git a/ksirk-24.01.95.tar.xz.sig b/ksirk-24.01.95.tar.xz.sig new file mode 100644 index 0000000..2b7aff1 --- /dev/null +++ b/ksirk-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44q0ACgkQOmpNuDnq +ptcT5xAAi0tpNl+OZbwv8UHR8DI6/WJ/yg0Qm8n7UrV6QunyAri1xyxD7M2mIWKQ +p079KdFGXBccPNdx/SW9JEivSN3ztbxHqCNxUIdXWQMDSN6LMrD7Gc6OMBPwcZfd +z+aeQsplNRM6XR5ZR/l2sSnCJJXrouTcosaRo8SDzpRtcVnAY2i49VhzvT4cU/8P +VxwGmc0ez90GlL43/Us6UkyQGcSu55Ns5wTqADUze+6Ns4LiWl8C+X7Qbcd3/9Bv +AIHVBBXAVs7gy3asCAZrr9gy91+QVzWsPqrwYROIEAX9Fx+C0UxLvVDhu4lpThWl +jMPjc39ziNOgbukNvHe/1bo1cuSbnHZq9b4pdZVJvHE42WtCDj4D4aAYgIO/UxcY +EvFhtY2b/aY7xnFDi0azuTEYBPvONt9lv6thgtgVU5hD1NY/zdOY+AX/hD4pVFyt +/hbHvB+5aQ331xaJ3Jp4YFSy26Ui6doLkLRYYkHHpuQzOWImyic/Uoov2NnjJMuh +RcoMQ8qdp82VLEQJif//12J5m4BvN+FbEMKx1SUbFSJgCpBgVLCjVmA/+VB8oaQs +JqdF+lorUlWyg2X9XDkGg/qtRqv5OgygOaYa4PONN0ZPM2iIeiufbYePv1X6bZmX +sVo6kS05YrKvMerYKgMfkeN1GtXDluMCtRxZ9+AvJBDhNND1Frs= +=Tk8h +-----END PGP SIGNATURE----- diff --git a/ksirk.changes b/ksirk.changes index 62982e4..f1a89bf 100644 --- a/ksirk.changes +++ b/ksirk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:22 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:11 UTC 2023 - Christophe Marin diff --git a/ksirk.spec b/ksirk.spec index 511e7da..c612c96 100644 --- a/ksirk.spec +++ b/ksirk.spec @@ -1,7 +1,7 @@ # # spec file for package ksirk # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,47 +16,41 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: ksirk -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Risk-like game by KDE -License: GPL-2.0-or-later AND LGPL-2.0-or-later +License: GPL-2.0-or-later URL: https://apps.kde.org/ksirk -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules -BuildRequires: libqca-qt5-devel -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5TextWidgets) -BuildRequires: cmake(KF5Wallet) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KDEGames6) +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6NewStuff) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Multimedia) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6SvgWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} Obsoletes: ksirk5 < %{version} Provides: ksirk5 = %{version} @@ -69,38 +63,36 @@ KsirK is a computerized version of a well known strategy game. %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} - -rm %{buildroot}%{_kf5_libdir}/libiris_ksirk.so +%find_lang %{name} --with-html --all-name %ldconfig_scriptlets %files %license COPYING COPYING.DOC COPYING.LIB -%doc %lang(en) %{_kf5_htmldir}/en/ksirk/ -%doc %lang(en) %{_kf5_htmldir}/en/ksirkskineditor/ -%{_kf5_applicationsdir}/org.kde.ksirk.desktop -%{_kf5_applicationsdir}/org.kde.ksirkskineditor.desktop -%{_kf5_appstreamdir}/org.kde.ksirk.appdata.xml -%{_kf5_bindir}/ksirk -%{_kf5_bindir}/ksirkskineditor -%{_kf5_configkcfgdir}/ksirk*.kcfg -%{_kf5_debugdir}/ksirk.categories -%{_kf5_iconsdir}/hicolor/*/apps/ksirk.* -%{_kf5_knsrcfilesdir}/ksirk.knsrc -%{_kf5_kxmlguidir}/ksirk/ -%{_kf5_kxmlguidir}/ksirkskineditor/ -%{_kf5_libdir}/libiris_ksirk.so.* -%{_kf5_sharedir}/ksirk/ -%{_kf5_sharedir}/ksirkskineditor/ +%doc %lang(en) %{_kf6_htmldir}/en/ksirk/ +%doc %lang(en) %{_kf6_htmldir}/en/ksirkskineditor/ +%{_kf6_applicationsdir}/org.kde.ksirk.desktop +%{_kf6_applicationsdir}/org.kde.ksirkskineditor.desktop +%{_kf6_appstreamdir}/org.kde.ksirk.appdata.xml +%{_kf6_bindir}/ksirk +%{_kf6_bindir}/ksirkskineditor +%{_kf6_configkcfgdir}/ksirksettings.kcfg +%{_kf6_configkcfgdir}/ksirkskineditorsettings.kcfg +%{_kf6_debugdir}/ksirk.categories +%{_kf6_iconsdir}/hicolor/*/apps/ksirk.* +%{_kf6_knsrcfilesdir}/ksirk.knsrc +%{_kf6_sharedir}/ksirk/ +%{_kf6_sharedir}/ksirkskineditor/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/ksirk/ +%exclude %{_kf6_htmldir}/en/ksirkskineditor/ %changelog