From c65e33940c7e5304d1c21974426f077945f6241c15f91917c7b82e9e70f7a586 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Fri, 23 Feb 2024 20:08:58 +0000
Subject: [PATCH] KDE Gear 24.02 RC

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/picmi?expand=0&rev=189
---
 applications.keyring      | Bin 6936 -> 5710 bytes
 picmi-23.08.4.tar.xz      |   3 --
 picmi-23.08.4.tar.xz.sig  |  16 ---------
 picmi-24.01.95.tar.xz     |   3 ++
 picmi-24.01.95.tar.xz.sig |  16 +++++++++
 picmi.changes             |   6 ++++
 picmi.spec                |  68 ++++++++++++++++++--------------------
 7 files changed, 58 insertions(+), 54 deletions(-)
 delete mode 100644 picmi-23.08.4.tar.xz
 delete mode 100644 picmi-23.08.4.tar.xz.sig
 create mode 100644 picmi-24.01.95.tar.xz
 create mode 100644 picmi-24.01.95.tar.xz.sig

diff --git a/applications.keyring b/applications.keyring
index 9b6ab5c7fcff549a5c7c241e56901e15961ca2d85add060b3d44e0c17f90c88d..299808814995a7df8af874c79c21b829723206c7161c5b8fa8cfe0dc780a9ae5 100644
GIT binary patch
delta 575
zcmV-F0>J&4HqI=t5dyPq1l9zz5CU8RvqK3p1hYUAZvua0`acK-2@=uIWdI5Z5ISm2
zxH;;k*T+;40G<zHpbi4{2{R-New{iRgz+}7gPuW%+~JS18yF26Xg)<zSUAAjB0YZ?
z{RS7tfrCKN{Px;^>B(?H*yWMAZ-``_*e|R_d~@}b<!$Y<%rvux%KW}ek#x-)?gN{}
z9iALnv2}lu2DznuN55W)j)8IQjTG{K*H$&$D!$MsT+;XRIhWlFAjNs$1*MoRoXw70
zf|P_E)TWF}SzwQa`Rv#g@E-m8)qw~wumZ;p7YiumA=0ew;%pIil_)~vPlgi?N^JG>
zcPza!RGVGD`Qt>8z4Pv1^*u-Q*}3*ef<NU%lKy`OkIz9-OiuR*Xkn)?UrAzw1@unf
zfCriF+fx3{PA*vr_q4ENdcCeT^_pyRlVVv{lWd-dbmL$JG7)n_@?yPc(kkKzxBbsh
zk1Zl@*rEA_+)O*Ua13EWv>L?z!Y^kQjR0ksk;$vLvv{#+63bg|LoJ93iAJM|vY1pr
z#y5X)sUQLPg*L0NvWwfTJb9+63+Zy9PoTA2KzeN+WNLXq?(tU_2}vf0yAp5l52p1*
z+mdZB^0;_=jDVe1(_3ht&hY0-j5eC(DU{HR<36y~o!!_x&iZfu<l9|u6u+<^qJnIU
z+1q3xbqgJ70HL(JYW5(RxO?j}c@!#$m7X3b7&!fJ-bLA0pv^kP!z^dzY49y69grjp
N%J_dmY_rK0PXum+8Fv5x

delta 1787
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

diff --git a/picmi-23.08.4.tar.xz b/picmi-23.08.4.tar.xz
deleted file mode 100644
index f092431..0000000
--- a/picmi-23.08.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6e76084de605318f4f6440d436d3ae41106042d0158ad044ae672d5bc7f7eb5
-size 1541732
diff --git a/picmi-23.08.4.tar.xz.sig b/picmi-23.08.4.tar.xz.sig
deleted file mode 100644
index 8a572ad..0000000
--- a/picmi-23.08.4.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7+8ACgkQu0YzUNbv
-Me80AQ//Yy148Nl3W0n0QhlEZipumgZSevRg4Cgug/xvNQLorRNhzXaRh8ugwhOg
-HaDkbmgFgf5Y60DvZPFCRZG95rr1843dod1sDa8Wqe55M7lAWZcKMX7CbJCR+NqI
-XgDYvPx6wUYzcTwjCUY4G/NgBnskjt96aypvhgz+oCjnfm2poe0JwxckYfqFM0BV
-Y7S4iBjC+c3qOWIkTqJQry1FM3jZJbnU9Uvvb20vpWoPcNSsexCv0ZAwfcI6bMXD
-dDG41wu/IvnJ3jWM51J7EsV4DPXYA7oKGXp47U56+hslp5hkQvINeEVWTvsOUNBt
-qVecexqjzXFKZy66poxlCVRLP13Y1l+1WwNp2dTwTr3B4J9OaSqK0Uy9p0uqarqY
-iM7+N2ssCI0po1Xp+qU/mU5kTtw7IjVXHOIxC40uxyCFA9kiyP6uPW/Fxr3Sxldr
-GyuC+/rDC23Yy+EOkKeW2zdEv/488lJ/W45J4Aiqr61y5nPCg/QNJB0VtSouFkpl
-BdwJ4gcFCWEBPzhvRAImoCxIbj8Eug6FySSe/ik5i3iHTzm1Q9l3O4aaIVFF4nuW
-8+KKs5EatARp+hAVRHPWFC6Rh4v+A8c2j/8Ts62tFpY6BpAzYXBrAcn++bXB3Rmd
-PIhathPg1JR48KC7fQfNQZ/ZtCauXGQ+SliPg3l6aeVU7W/acBk=
-=olah
------END PGP SIGNATURE-----
diff --git a/picmi-24.01.95.tar.xz b/picmi-24.01.95.tar.xz
new file mode 100644
index 0000000..f01e462
--- /dev/null
+++ b/picmi-24.01.95.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e952ee785433c30f6b3daa51e69f3e60cefdb5b52e764b432da3e7b06c06fd68
+size 1541808
diff --git a/picmi-24.01.95.tar.xz.sig b/picmi-24.01.95.tar.xz.sig
new file mode 100644
index 0000000..11fde0b
--- /dev/null
+++ b/picmi-24.01.95.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44wYACgkQOmpNuDnq
+ptfDJg//cq4Efvx8+gbbd3p5PebXpgSelgCFeD3QZViJhCXQ8vaZV3/I8t4ijxK/
+Eip7WkNvtt8hTltqOctr9onAbrzEE5nwrJrVUOU+CPz30uBrqxNxirdSdJQGaImN
+t+Lzs3fr+o5rLrIs8zaoGnj8yfOwsDsarFIngN9woJHZMr46reTBl9VNwxPUvABv
+qkVyAsLCqeIZ1VgJ4wrFFg68IhkbW0xixbFtKkRgrzknTdcc//CPva0BLHuopDWI
+Gbj3onEfaCRQ9RCvtHiCYoVSvOD3kz9/qv4tmw5qlBkH2a6jiI0zDBNZX4wEaJSn
+8JPCUP3iVHaGNEtn5x1qqnp5jgeuw7Uvzh0O0xj9iolbDTefcy8vrmFbSkBUm6p/
+MiapYJPz849+qzBmzfUCuxe1yor7teHcKYPtWp5zeRd8shVJgXZSsG3GHqKnQ60x
+9Xe9X3G9JuKSgayZLHyI9i/7pwr5IBy5gQbc0QoxoCqaOzUAq7xKhTXed3UitGux
+t+crxISYrtodOunh2eUNZAF8OUe1kJfcUXCWqVBCo61T+rHOdh1w3CGUMw/TVlKM
+49YqdQ+7OIwfg3j1DO3yzLCcK4Vs+99hqY+l4BfTM8I1shDnuvANOhAh3rvIMELJ
+VeerbEwm82aU2dhsi14VPSz20b2lOX/J0QmfC9SAcspbjmSA7Dw=
+=tEzA
+-----END PGP SIGNATURE-----
diff --git a/picmi.changes b/picmi.changes
index 66263f9..3a476e9 100644
--- a/picmi.changes
+++ b/picmi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  9 16:10:05 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.01.95
+  * https://kde.org/announcements/megarelease/6/rc2/
+
 -------------------------------------------------------------------
 Tue Dec  5 14:20:36 UTC 2023 - Christophe Marin <christophe@krop.fr>
 
diff --git a/picmi.spec b/picmi.spec
index f72dea0..7ea8f21 100644
--- a/picmi.spec
+++ b/picmi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package picmi
 #
-# 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,33 +16,34 @@
 #
 
 
+%define kf6_version 5.246.0
+%define qt6_version 6.6.0
+
 %bcond_without released
 Name:           picmi
-Version:        23.08.4
+Version:        24.01.95
 Release:        0
 Summary:        Nonogram Logic game
 License:        GPL-2.0-or-later
 URL:            https://apps.kde.org/picmi
-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(KF5CoreAddons)
-BuildRequires:  cmake(KF5Declarative)
-BuildRequires:  cmake(KF5I18n)
-BuildRequires:  cmake(KF5KDEGames)
-BuildRequires:  cmake(KF5KDELibs4Support)
-BuildRequires:  cmake(KF5NewStuff)
-BuildRequires:  cmake(KF5XmlGui)
-BuildRequires:  cmake(Qt5Core)
-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(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(KF6XmlGui) >= %{kf6_version}
+BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Svg) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Test) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
 Obsoletes:      picmi5 < %{version}
 Provides:       picmi5 = %{version}
 
@@ -55,29 +56,26 @@ A nonogram logic game by KDE
 %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 -r org.kde.picmi Game LogicGame
+%find_lang %{name} --with-html --all-name
 
 %files
 %license LICENSES/*
-%doc %lang(en) %{_kf5_htmldir}/en/picmi/
-%dir %{_kf5_iconsdir}/hicolor/256x256
-%dir %{_kf5_iconsdir}/hicolor/256x256/apps
-%{_kf5_applicationsdir}/org.kde.picmi.desktop
-%{_kf5_appsdir}/picmi/
-%{_kf5_appstreamdir}/
-%{_kf5_bindir}/picmi
-%{_kf5_debugdir}/picmi.categories
-%{_kf5_iconsdir}/hicolor/*/apps/picmi.*
+%doc %lang(en) %{_kf6_htmldir}/en/picmi/
+%{_kf6_applicationsdir}/org.kde.picmi.desktop
+%{_kf6_appstreamdir}/org.kde.picmi.appdata.xml
+%{_kf6_bindir}/picmi
+%{_kf6_debugdir}/picmi.categories
+%{_kf6_iconsdir}/hicolor/*/apps/picmi.*
+%{_kf6_sharedir}/picmi/
 
 %files lang -f %{name}.lang
+%exclude %{_kf6_htmldir}/en/picmi/
 
 %changelog