From 8b67355be93ecab81cc04e565a6fd7c900ebc0d8c32e6cf651ad0846da42bfa4 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Mon, 26 Feb 2024 06:52:20 +0000
Subject: [PATCH] KDE Release Gear 24.02.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=14
---
 merkuro-24.01.95.tar.xz     |  3 ---
 merkuro-24.01.95.tar.xz.sig | 16 ----------------
 merkuro-24.02.0.tar.xz      |  3 +++
 merkuro-24.02.0.tar.xz.sig  | 16 ++++++++++++++++
 merkuro.changes             |  8 ++++++++
 merkuro.spec                |  8 ++++----
 6 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 merkuro-24.01.95.tar.xz
 delete mode 100644 merkuro-24.01.95.tar.xz.sig
 create mode 100644 merkuro-24.02.0.tar.xz
 create mode 100644 merkuro-24.02.0.tar.xz.sig

diff --git a/merkuro-24.01.95.tar.xz b/merkuro-24.01.95.tar.xz
deleted file mode 100644
index 75d36b9..0000000
--- a/merkuro-24.01.95.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72ca5d7064f1bc0ee0da6449f6403eb024cb7f58283f9398904e43fd25e4ddd3
-size 729320
diff --git a/merkuro-24.01.95.tar.xz.sig b/merkuro-24.01.95.tar.xz.sig
deleted file mode 100644
index 9d1baf3..0000000
--- a/merkuro-24.01.95.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45KUACgkQOmpNuDnq
-ptf8fQ/8D1FTyZ9L2xdTJkS//B/mtTzNrifXaMBGJjFUGHuLTD26YuSbgndo798b
-El8ZxB+3FgalPAU/htdU4tQRJf2ahx2B4CXXHfdFrYnTnVVdsIdhV5gTnXAvI40j
-lc2nA0CPcpbm3prRJr1tgcm+PC1S/HOsP3dEWEQsPoxJPwiEvaiYCc5t4sykijV/
-Rhb63yZY1V0UD/QEHUx3w0QhrC2XiFWecvMzbV+D1HmcjseB8+4O0Zm2pX7vBYzS
-XxEfV6QA3sAWtOhHlIYYEdX9MWu9GOerDaCu5QecLILX1XDNrlxcZ7PeY1Igqc4N
-ddv+JhMNo9WtuKGbTt8ah6gQ4uZPC2xwCDdTIqPPE3eZCEPpRgMIIpWLUsW/bAWn
-M7wLhVFVRr+V2khmtGkQit43WjP6sqqOjjqUh7u4V4Rsi9CxLrXrb2qhxlxtP7tP
-cVJ7THD+jXWiwtc1O4Sw5IsYe0rZL2GlyWc8q9O6vOPCiJIjv+2Fp5M7zvMQKaOt
-6VV6Z+wjfzlcht9g0j4x8eGDfaAAEBhKICj6097uON9h0ho7CRWMQPQTZWVvmNHK
-RrxA+MBlKkdCzHrvtr9t8bo77n05B9ilTJxJptz6TUb/WYcwzAhI/H6ExoYLLQFU
-hZOdUsdLAvPOfvGMN+eX8ZE0Opp8le4REPvSpWywG14KTfaBLyQ=
-=5txH
------END PGP SIGNATURE-----
diff --git a/merkuro-24.02.0.tar.xz b/merkuro-24.02.0.tar.xz
new file mode 100644
index 0000000..08fe53f
--- /dev/null
+++ b/merkuro-24.02.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a31bb56407c90ad4e2e5dfb01b179edf6589e9bfc6e614d83172639acad4bf51
+size 738168
diff --git a/merkuro-24.02.0.tar.xz.sig b/merkuro-24.02.0.tar.xz.sig
new file mode 100644
index 0000000..1ff1ddc
--- /dev/null
+++ b/merkuro-24.02.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVru0ACgkQu0YzUNbv
+Me/fag//fPg5xFLkpUe43VZvvHlYZ034yf5RDHHL9bMuU9jyB8X22thNc9ZV4HIF
+74LMGBAGx6FrHjiayexzFG3KidQaRWL7EhvOWQk6oiedm8D699D7FwZ7Sxj60ol2
+yCR0P7/+9wiDAbRLIadFQxUKOrl7HVvQ4vs0NV9XtFm6JvFTWIQkAiLWHT8LYvAY
+tgCUeXWeFxSb8G3NMg476244f39QHaaCkG5Szd0vHYzUa4GCtaRMngZteSs4IrY/
+sz7pzB8aNQUWJLMGD1BUiSfFBEq9ANF7zotVe6EdIUpSYiYHWa6qUntuinp2ty7v
+EhVNSxF1wiFc8fEoOpMLFuj/SqGvNkEvbYPk3xqdenRrY7/spyfbDKUc9aY9t172
++xnFp8hr18JKMLTu9FYcAwvVV4HxYJwqfvCTEKPgdVJa7QMK7XjCBgZoJmTt5+yb
+YoNWfe4Is27KGFRD/HW5DFEB30S8Ch2u4isX525VrzxlGY7egWv1nNo7J8utGx1r
+iseVxhRUrtma9Qp2DdD/iTqZ6jqpBhXj4qQb2qusWpxikSLorMbNHVDV8RwGi0xO
+gGcKJmtfhmGxTdb1w1RPi2iZ9bcvHPq7w61TY4kCeBUqM4LYi6+AK6GxGB999FQW
+AwQRfWb/JBuK6wDV9XipKB9s1CTz7wRJbhOFxcDiXBSI8XRBYNc=
+=d8yt
+-----END PGP SIGNATURE-----
diff --git a/merkuro.changes b/merkuro.changes
index ae5f056..031041e 100644
--- a/merkuro.changes
+++ b/merkuro.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb 23 14:00:50 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.02.0
+  * New feature release
+- Changes since 24.01.95:
+  * Add back no display in mail desktop file
+
 -------------------------------------------------------------------
 Fri Feb  9 16:09:58 UTC 2024 - Christophe Marin <christophe@krop.fr>
 
diff --git a/merkuro.spec b/merkuro.spec
index 07691b1..58ad543 100644
--- a/merkuro.spec
+++ b/merkuro.spec
@@ -20,19 +20,19 @@
 
 %define kf6_version 5.246.0
 %define qt6_version 6.6.0
-%define kpim6_version 5.240.95
+%define kpim6_version 6.0.0
 %define plasma6_version 5.27.80
 
 %bcond_without released
 Name:           merkuro
-Version:        24.01.95
+Version:        24.02.0
 Release:        0
 Summary:        Calendar Application
 License:        GPL-3.0-only
 URL:            https://apps.kde.org/merkuro.calendar
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif
 BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}