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/ksudoku-23.08.4.tar.xz b/ksudoku-23.08.4.tar.xz deleted file mode 100644 index 91ea09a..0000000 --- a/ksudoku-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa372d3dc6cae731ce10c467f461c11cdeb903a53e665aeaf83da05a4fa6f317 -size 1709996 diff --git a/ksudoku-23.08.4.tar.xz.sig b/ksudoku-23.08.4.tar.xz.sig deleted file mode 100644 index ff46840..0000000 --- a/ksudoku-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu76cACgkQu0YzUNbv -Me++cg/+LKET/t/yXmxaot4+NORxjI2ymh8IfgVSE34YNC+M8ZsJcghl9HnaMa78 -KiNxjIn+JB/bmGf39rd1TVc79EnRSLDSKIcnlkABSjqrrOrnbQxM2xcAoU7qDLS4 -FuN3IOu+cEak3gOy2RZ+nUrtpKVUd8Zm21XIOeB/1JMRSaVPmqolk96xzGfFBoLV -Xfce5g4KgUv3mCSKE50fCMZS3f7JuacXMdznZ8s7+HidCDjPwC8aJ1T8b0v0NQ6x -akzhY+DF6Lrf9ZL5CWWFlb0dxxoGw/BZnVSWkk/V6MbBTgogtsFSxPUaG1VbTlM/ -7obM4h+HYUgQdlRTzlbbRKcrgm9PbwRAm0NbasR7Z8RiGNMCN/oIpoSYhpuRHyHA -2NSW86aeIVPmhHK+WMh4oy/KOWLhCK2D4DpcZ8AKKiNGD+JJw2H9C5nJ6uj0OmNN -Yv9e9oJYiKNai82/EYNvAY/aLm1FxqpM4z14jY/KrZyVjy6zviSrBmh2USfz9dHO -iPjNpZmIuYKjLdRor7dVVuMGhvuxWrvDi+/Mp4HC/XbcLicYceyksQGrzozQ353P -tJ3nGwhWLWfzTgmCViJifEH2ih1RZQRYekViC1jyQXavLvym3OlNKCnN7/i9JnCT -pLbI5XBUUdkLMy2CYW8TWCJLE4dQb2SzasyBuGK3W17otDsSqdY= -=1/uA ------END PGP SIGNATURE----- diff --git a/ksudoku-24.01.95.tar.xz b/ksudoku-24.01.95.tar.xz new file mode 100644 index 0000000..ea44767 --- /dev/null +++ b/ksudoku-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e224552bcad99b49d30c5b9916355f268b19de9d6c45fdb32f29c9e77d294171 +size 1709784 diff --git a/ksudoku-24.01.95.tar.xz.sig b/ksudoku-24.01.95.tar.xz.sig new file mode 100644 index 0000000..22c7f78 --- /dev/null +++ b/ksudoku-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44roACgkQOmpNuDnq +ptevnw/+M7uOnkOygpcHtxBisU9ahPpRSHZLMyIJahqFj4yNDK2lrLnDDObKnB65 +NDhhFhRV7DhLkYnxLC4XqjMlNH+U4LZM/AU5xp6qdhn3hU9spGue+IgHXvq87RSO +EEkE3+/nBhTcDFpbr/X6TQ8T4P8keb6kuOAGb4TTCLMRh0R0++S/tA4zCZR76EB1 +Coe80dcLP4bAu2M81UmjRkfhuEGI3OEikBgpWe42CU+77uCrSwYoeMKV3ExjB8Y1 +kWBs0qfK12s5AILmLX0/YDbPeUbBsoTWScI3YLvtG3UGGirVXiuz6NdIfi3+kimz +xrV1wqBL+rpFztxqEFbjMrJRknTAfVUqQdk63b0qfVENpwXiAV25aHyM3u09bbdL +fFxt3liveZatNoGFmKV1x8H2869m8Xbxxp4MylUZtWPE9KwRSqelX9Nma0mL8L5t +ry15m2b0JZrbEbKhgQFZRdvKUQvN06Q5xgLM24DmcHKUOz7N2CRRbDRXL7kczG+q +/JQTmuqdyjAgEtMdD3xd3UiA4vVLOZQ80rVFSRnkQWV1J5fyOPbFML2M32PHPlEh +Gd1pWxbfVAtMdw/nRteisl0QeqNH9ISqxqlkPf2qgt/j2iNJQHaZWUhEC5EesxUN +IAC0jkHD5vzrvl1mC8Mv/qsDRj7n6TQjEzVvNeeNOQbMDgPSdrc= +=ewBL +-----END PGP SIGNATURE----- diff --git a/ksudoku.changes b/ksudoku.changes index 40b487d..c37b703 100644 --- a/ksudoku.changes +++ b/ksudoku.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:26 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:14 UTC 2023 - Christophe Marin diff --git a/ksudoku.spec b/ksudoku.spec index 711bc3e..cc187d9 100644 --- a/ksudoku.spec +++ b/ksudoku.spec @@ -1,7 +1,7 @@ # # spec file for package ksudoku # -# 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,44 +16,44 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: ksudoku -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Program to generate and solve Sudoku puzzles in 2D or 3D License: GPL-2.0-or-later URL: https://apps.kde.org/ksudoku -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: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5TextWidgets) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5OpenGL) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KDEGames6) +BuildRequires: cmake(KF6Archive) >= %{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(KF6JobWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6KIO) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6OpenGLWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6PrintSupport) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(opengl) Obsoletes: ksudoku5 < %{version} Provides: ksudoku5 = %{version} @@ -70,27 +70,26 @@ number twice on each column, row, or subsquare. %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} - -%suse_update_desktop_file -G "Sudoku Puzzles" org.kde.ksudoku Game LogicGame +%find_lang %{name} --with-html --all-name %files %license COPYING* -%config %{_kf5_configdir}/ksudokurc -%doc %lang(en) %{_kf5_htmldir}/en/ksudoku/ -%{_kf5_applicationsdir}/org.kde.ksudoku.desktop -%{_kf5_appstreamdir}/org.kde.ksudoku.appdata.xml -%{_kf5_bindir}/ksudoku -%{_kf5_iconsdir}/hicolor/*/*/ksudoku* -%{_kf5_sharedir}/ksudoku/ +%config %{_kf6_configdir}/ksudokurc +%doc %lang(en) %{_kf6_htmldir}/en/ksudoku/ +%{_kf6_applicationsdir}/org.kde.ksudoku.desktop +%{_kf6_appstreamdir}/org.kde.ksudoku.appdata.xml +%{_kf6_bindir}/ksudoku +%{_kf6_iconsdir}/hicolor/*/*/ksudoku* +%{_kf6_sharedir}/ksudoku/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/ksudoku/ %changelog