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/kpat-23.08.4.tar.xz b/kpat-23.08.4.tar.xz deleted file mode 100644 index de5e5b7..0000000 --- a/kpat-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:443cb2994ce36ebd9501e69aad356e9180ce11f77f979aaffa3b5446e8cef364 -size 3755892 diff --git a/kpat-23.08.4.tar.xz.sig b/kpat-23.08.4.tar.xz.sig deleted file mode 100644 index 458ba69..0000000 --- a/kpat-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu748ACgkQu0YzUNbv -Me+uuA//eWStaksFKrMIC7QaNhvgpoUwWkr+2A5TP9D/MPPUta1T5rgWJxtvN+az -zxyURBWkxh9ffi5n5l3+PwOiFJiA+Gx3A8GdTz6wHS9M4PsdR65fv8CqcBN9cqkr -oio3aZ6atgpaDhJwSKHSWvPBdL+Upx8XHPXgW9A+ZgJg7UfbRojlQpcg6f75gEWc -BsK7p3TH4ipYEF9kpFc05YXre7au3e7OoS/ncgr4QQrbVaknYU2647x8XxJ3iOus -1s5DE/6FH4GvDI2C9B3WXqW5s+BIZVdfnavhFfps+AOpoFkT/j1ItKDNp8hQliHN -aP0cwghgU9xhmsAPvv0px1bZDzQEWI9KEThDkNpdXSzImU6UeVCRrfHL5AHjNjnb -Uy55Nd7aYNAUCo3liM9PkN6nGGEp9UA8wAJn31oIYlYZsSz4OGb4ms/whhkm3JO4 -iuPPgNtglWDcpL0UxEVlwvHC4MTQJIuoDYx55PykpRNVTjfzuPe8eMTVM1NoHDNE -keRjZjEGq4zMukBrjW6GkIWqiQlc+28q18JcQbo6XJbnprrtAqS5yTTUR7z90TPZ -D0xbprARBLm8ubXSNGju3CRWfjDXG2CeWZ17pN+8R2xJtRxwx+g2EvqieWvMdg0g -yB1Cdz49xwnFQfaJkYq7gyQtM3LGBMWFvu4bA6rFVX/tMkk22PA= -=cs75 ------END PGP SIGNATURE----- diff --git a/kpat-24.01.95.tar.xz b/kpat-24.01.95.tar.xz new file mode 100644 index 0000000..e699659 --- /dev/null +++ b/kpat-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484cd7db8a5ba418a59fd400884a069919e69c479b7216ba800ed6bc25b713ad +size 3713508 diff --git a/kpat-24.01.95.tar.xz.sig b/kpat-24.01.95.tar.xz.sig new file mode 100644 index 0000000..5f1edff --- /dev/null +++ b/kpat-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44p8ACgkQOmpNuDnq +ptdWgw//Zl7dI1m9eRp8ijwfJCi2KTdB2VJSD2EAUMEReezOd0meRfreiBy0WkEw +rcXx5/9GvBjmFdTisMnJ7JGEYatUzr2ctk0R2IBm7TjZYTtUYp+xRn2DQ6BMy1ow +S0qAQ/Qi21cKpLMwny+wjGwwX6pQ8RJNHcBL+OSbRHkhVO0ZCnKzRnhq8KeBGSc9 +A8bT8Vb6bZ/58R4RaF9TsGFW0n+wXNfmmbfDErPDdEaMJ+5J4OvUmd5y5SZJMr5P +e6KxBqHVaNM8PsfioFTYdqr4FIuIoeC24gM3o5u1G4iYeyFPQGImudIBMLQoUqN/ +ATiqnT1OnALnwxoJh/dOSJlqTsnYsT/4rHS9q7O1VXfQREa2czNadfckxQ8u0xRd +9mZbVMT2mONUf0bA5TINsfXa58BlXS/6BJT12wIZThYRYRbHtX/YjpvPKBO1bl1t +3LYBvmo63w82cZrc1U3oeP479KTWQsDWaReD4K07dRarmKUdLBabkBAOaPKbFiY4 +qFQYvCoSXTDXg+CPnLwOdPcvXdO10b8h0cL72Z8XJyeV9iokCAl1EDZG7dfoe2Pu +n9EY3XZyDcRACTb9RT8OHA9Gzbpe6pu8FS/FY/ZFsB30nBjCunoXB9JRz4Xs5O9k +RCNnb2M9trk8NzGG5Q12T44KKpfnKL3TOOjFJWKI7oao3Q1E+cE= +=0XKa +-----END PGP SIGNATURE----- diff --git a/kpat.changes b/kpat.changes index 51a0efa..e9be676 100644 --- a/kpat.changes +++ b/kpat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:10 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:04 UTC 2023 - Christophe Marin diff --git a/kpat.spec b/kpat.spec index e8e5eeb..1f45754 100644 --- a/kpat.spec +++ b/kpat.spec @@ -1,7 +1,7 @@ # # spec file for package kpat # -# 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,56 +16,50 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150400 %bcond_without bhsolver %endif + %bcond_without released Name: kpat -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Patience card game License: GPL-2.0-or-later URL: https://apps.kde.org/kpat -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: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: freecell-solver-devel %if %{with bhsolver} BuildRequires: pkgconfig(libblack-hole-solver) %endif -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5TextWidgets) -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: cmake(Qt5Xml) +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(KF6GuiAddons) >= %{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(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} Requires: kdegames-carddecks-default -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +Obsoletes: kpat5 < %{version} +Provides: kpat5 = %{version} %description KPatience is a collection of various patience games known all over the @@ -78,44 +72,37 @@ more. The game has nice graphics and many different carddecks. %autosetup -p1 %build +%cmake_kf6 \ %if %{with bhsolver} - %cmake_kf5 -d build + -DWITH_BH_SOLVER:BOOL=TRUE %else - %cmake_kf5 -d build -- -DWITH_BH_SOLVER=OFF + -DWITH_BH_SOLVER:BOOL=FALSE %endif -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name -%{kf5_find_htmldocs} - -%suse_update_desktop_file -r org.kde.kpat Game CardGame +%find_lang %{name} --with-man --with-html --all-name %files %license COPYING COPYING.DOC -%doc %lang(en) %{_kf5_htmldir}/en/kpat/ -%{_kf5_applicationsdir}/org.kde.kpat.desktop -%{_kf5_appsdir}/kpat/ -%{_kf5_appstreamdir}/org.kde.kpat.appdata.xml -%{_kf5_bindir}/kpat -%{_kf5_configkcfgdir}/kpat.kcfg -%{_kf5_debugdir}/kpat.categories -%dir %{_kf5_iconsdir}/hicolor/24x24 -%dir %{_kf5_iconsdir}/hicolor/24x24/apps -%dir %{_kf5_iconsdir}/hicolor/256x256 -%dir %{_kf5_iconsdir}/hicolor/256x256/apps -%dir %{_kf5_iconsdir}/hicolor/64x64 -%dir %{_kf5_iconsdir}/hicolor/64x64/apps -%{_kf5_iconsdir}/hicolor/*/*/kpat.* -%{_kf5_knsrcfilesdir}/kcardtheme.knsrc -%{_kf5_knsrcfilesdir}/kpat.knsrc -%{_kf5_libdir}/libkcardgame.so -%{_kf5_mandir}/man6/kpat.6.gz -%{_kf5_sharedir}/mime/packages/kpatience.xml +%doc %lang(en) %{_kf6_htmldir}/en/kpat/ +%{_kf6_applicationsdir}/org.kde.kpat.desktop +%{_kf6_appstreamdir}/org.kde.kpat.appdata.xml +%{_kf6_bindir}/kpat +%{_kf6_configkcfgdir}/kpat.kcfg +%{_kf6_debugdir}/kpat.categories +%{_kf6_iconsdir}/hicolor/*/*/kpat.* +%{_kf6_knsrcfilesdir}/kcardtheme.knsrc +%{_kf6_knsrcfilesdir}/kpat.knsrc +%{_kf6_libdir}/libkcardgame.so +%{_kf6_mandir}/man6/kpat.6.gz +%{_kf6_sharedir}/kpat/ +%{_kf6_sharedir}/mime/packages/kpatience.xml %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kpat/ %changelog