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/kblocks-23.08.4.tar.xz b/kblocks-23.08.4.tar.xz deleted file mode 100644 index 206c238..0000000 --- a/kblocks-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8cb87a24d37259b4ca5e07ad7f907c98f031d687a974c6838d839c6679b976a -size 2109608 diff --git a/kblocks-23.08.4.tar.xz.sig b/kblocks-23.08.4.tar.xz.sig deleted file mode 100644 index 9e6337d..0000000 --- a/kblocks-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu71AACgkQu0YzUNbv -Me+D6Q/+JNNK+K4GKuDkYChjLuGzhN8ltIc9tdyhhveBwSNNDq7gKO/eyF8TbYbG -gNMkQw0MzRI/x/1O0ZyIOwHwVTQtsqrOHyek0uOZuHnKQU9NDINT7zEm2sQ+OxFh -bEAz9WGQ+934rHcBB5Mp8UZAVnczyr/34YUt70TZ+8fDF2ZIRoaNMWR3wajRLheI -W3yLXX5/y0UAE6FRSTEWCaPLO4FG8qy8CPphvAWErbWOCzeAqtjJ5rNGHc7QURfX -Gt6TBj4be1Owuz+AR2ue0rme0K93pQG3J+U/YCeXfuOs7PGQM13NLv/ouh8Eu+KU -vYrY1ArMshYzt+l78MIuDAQ86+zK8nHPaZm/qx8TDzCXVCPbG6RHIz5b6volKLYF -lbkuhtoC8pzbeG1fL4HzcmpveFjhWglUHH0ogVRLh634YkCVDkfWagK2Qrm3uElC -YLXNVpuyJgFPSFnekghC5LBcwPbE1eVdv8v7ADRvFYZKvJWCGLbZ5yIHNfQK7+pz -Sgcph8vd8nUd/XqSoyrxORRh65REFc3sJToS54c+uaVkhLPoHXOMzD11wKverAfc -mp4Oigv+zsv+SmGTTWJ14vFdN9t9RaekdQjHmeQ0gTA+6jpAADA9J1hmHw0SpcRf -oQ8UCcKjXUHWSkOysP98rdU+WHI/Zwe71anZCI+0F0j8+ed1+ts= -=VXzF ------END PGP SIGNATURE----- diff --git a/kblocks-24.01.95.tar.xz b/kblocks-24.01.95.tar.xz new file mode 100644 index 0000000..0ac74c5 --- /dev/null +++ b/kblocks-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a53450b34b6b47db8e36d9036aba0df44969baab080be3c65657f06ac77491b +size 2108340 diff --git a/kblocks-24.01.95.tar.xz.sig b/kblocks-24.01.95.tar.xz.sig new file mode 100644 index 0000000..95b9264 --- /dev/null +++ b/kblocks-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44lUACgkQOmpNuDnq +ptd4UQ//dHrbFDHHpAm/9HwEni5av6uOqP7KvlVG81z3dkRYwSFgJ7F9TvMlU2fm +Rs9o0D45Zka9k6daDNjZanA+gyEOylRl1ymmshFADh+ep896XNjblNA2E0t/6Mm9 +XD3DxIhiktSOJ2mnsyUIydJR7Fkx7y3UjX3hzzete2A6EMKAZT3aK5nPsekt4JXE +9UPTGkHRAmJxy1U9vvip007RekHsdOje/dI/1ku3J+PN1BwWgRvj1bVCQ+UBlwW+ +ADMN9SpMCkYc4vS3rwymbHEzB+voGeUBslUo0VcZ8VXiBaxpq7nzXqwaEOgvP3Mb +wF7YmR8dMqR3kA/grM1jMoGXvaeaM6CMst+6OlV4B65UcZ401C31pcZ0STubUyNZ +ogApvc5odT6oxBedSI6DpqMSZ3OWCjik8ZJRzmYOo2xK/GwHEf60R251G3XnZvYT +YECiSXakxGvoPh1vHVgo8WbSQMxRG8hvT/Fa6o7YhdIopLza6Pz1aWWUUx342kcI +uAbQRb5diu/iNo7z3NmAliwaAL89EsqCTjVYnYH5VaUpuJ/cvZfQxu9udU4P4EZ1 +Vsza7pZP9S6INJWBphzRiMcUQ8ippo5DWZmjK2jSpKJgVY2CivcPY6M9LS8Uisb3 +ekl5rlr+LyxMrxDrK+17G/VexOBnGCUGZ9yw/1hohiuG+skfnIE= +=80kr +-----END PGP SIGNATURE----- diff --git a/kblocks.changes b/kblocks.changes index f432a8b..443f8ba 100644 --- a/kblocks.changes +++ b/kblocks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:07:52 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:18 UTC 2023 - Christophe Marin diff --git a/kblocks.spec b/kblocks.spec index 37f08ec..238a7ac 100644 --- a/kblocks.spec +++ b/kblocks.spec @@ -1,7 +1,7 @@ # # spec file for package kblocks # -# 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,42 +16,39 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kblocks -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: A classic falling blocks game License: GPL-2.0-or-later URL: https://apps.kde.org/kblocks -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: update-desktop-files -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KDEGames6) +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(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Network) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6SvgWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Obsoletes: kblocks5 < %{version} +Provides: kblocks5 = %{version} %description KBlocks is the KDE version of the classic falling blocks game. @@ -59,30 +56,31 @@ KBlocks is the KDE version of the classic falling blocks game. %lang_package %prep -%autosetup -p1 -n kblocks-%{version} +%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} +%find_lang %{name} --with-man --with-html --all-name %files %license COPYING COPYING.DOC -%doc %lang(en) %{_kf5_htmldir}/en/kblocks/ -%{_kf5_applicationsdir}/org.kde.kblocks.desktop -%{_kf5_appsdir}/kblocks/ -%{_kf5_appstreamdir}/org.kde.kblocks.appdata.xml -%{_kf5_bindir}/kblocks -%{_kf5_configkcfgdir}/kblocks.kcfg -%{_kf5_debugdir}/kblocks.categories -%{_kf5_iconsdir}/hicolor/*/*/kblocks.* -%{_kf5_knsrcfilesdir}/kblocks.knsrc +%doc %lang(en) %{_kf6_htmldir}/en/kblocks/ +%{_kf6_applicationsdir}/org.kde.kblocks.desktop +%{_kf6_appstreamdir}/org.kde.kblocks.appdata.xml +%{_kf6_bindir}/kblocks +%{_kf6_configkcfgdir}/kblocks.kcfg +%{_kf6_debugdir}/kblocks.categories +%{_kf6_iconsdir}/hicolor/*/*/kblocks.* +%{_kf6_knsrcfilesdir}/kblocks.knsrc +%{_kf6_sharedir}/kblocks/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kblocks/ %changelog