From 1f072de9df87ce5d10f2014584b6e41aa9d3176da76f5d850979dbca7a33a2c2 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Thu, 23 May 2024 11:00:57 +0000 Subject: [PATCH] KDE release 24.05.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/merkuro?expand=0&rev=21 --- merkuro-24.02.2.tar.xz | 3 --- merkuro-24.02.2.tar.xz.sig | 16 ---------------- merkuro-24.05.0.tar.xz | 3 +++ merkuro-24.05.0.tar.xz.sig | 16 ++++++++++++++++ merkuro.changes | 20 ++++++++++++++++++++ merkuro.spec | 11 +++++------ 6 files changed, 44 insertions(+), 25 deletions(-) delete mode 100644 merkuro-24.02.2.tar.xz delete mode 100644 merkuro-24.02.2.tar.xz.sig create mode 100644 merkuro-24.05.0.tar.xz create mode 100644 merkuro-24.05.0.tar.xz.sig diff --git a/merkuro-24.02.2.tar.xz b/merkuro-24.02.2.tar.xz deleted file mode 100644 index f515f27..0000000 --- a/merkuro-24.02.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1afcb7186398a20ecb26a83e0033852a7f82c10c1d21aca43b9284f152dd063b -size 742448 diff --git a/merkuro-24.02.2.tar.xz.sig b/merkuro-24.02.2.tar.xz.sig deleted file mode 100644 index a2879d6..0000000 --- a/merkuro-24.02.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmYU1A8ACgkQu0YzUNbv -Me8c5g/+PmDbG5P2LSTpe4nYB5p8Z7qGEfhirPU+tye7rfgE29OpePPLuTIqcU90 -qxtxJ5Ez4qIssKnu/aLWXGX9OFe0aDOpCPS3Jkr7qRyVNGmItS7tMgNIxnaqv/f2 -JpS5n1D3FXVYBi+E0+pEdxYPyUV05b+PJEo2KT5k+FuDzFTrZ0JdTuAxJggWCx40 -RfEwU5fT30bApe8ak3wvxBWocQDIhRdtpA8uX1DQ6LStnlagaUTykcL/dtpNuHaE -nxvLuhLX6Cqlyel7sx1bkdlWPkisfBK1Qk4u68s7jNw9VK2iDYWMirymsoByiVBx -mHs4Ejzj0ovh0AIyoiebGBno5sT/87haQ/oYjF4rb4j/aA6NHe6raGS5k0NZ9uDA -6UkuZm/MSg1QT8RE0y09Wu8qN/NHa4dP7RZUXWw9oIDMh+ww+TIHyp9YxL7lQ7Qr -0X5vBbpYuT0jzHWTTTITw2vBpwtbb+tVp5yy8RFyFqWLH/1YmUTxSvL/vy0ZbEq/ -MFJ4Eq3RZVplacvZ+Bx17cvrCQI/0Y9jSBEQ+cIbK8hR3sw+suc4PnrwCSAMrtIG -ASD6S9TboOWcxpQcu70/ojzz2YR873LDi5/frtpLXeVXU6TNl9/5g9CmFhsXqXkk -QImPo3TNoxDsWn0TqKZXPZhxKJlHL/pMGj2fn7vGuVncqp56kZY= -=r7Dw ------END PGP SIGNATURE----- diff --git a/merkuro-24.05.0.tar.xz b/merkuro-24.05.0.tar.xz new file mode 100644 index 0000000..3ba94e2 --- /dev/null +++ b/merkuro-24.05.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb632e5a181eafd7f0712531b1accaf755d81c80eb9bf8fedd8c59fd4305cae2 +size 747544 diff --git a/merkuro-24.05.0.tar.xz.sig b/merkuro-24.05.0.tar.xz.sig new file mode 100644 index 0000000..758f90b --- /dev/null +++ b/merkuro-24.05.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmZG/r8ACgkQu0YzUNbv +Me9jmhAAkUYj2FbfDZjzZb9w3BsMA/j5vkHOrrBoZ8R4W17OMa/3Jc1HrcwZivX6 +UbS1/fdLqxHGtqeOKpaOU6PDTfrbPCmC887HwJuqlKEXQVgd1gdNExwiBE2OWjRS +hPV85bsJD3tue55lV/TMAuoW661494sTBAhDZLxj/yq/DLkFbNw0O+it2OnFM/ie +wcuJA81UVzlvgIdJQoYE13tF2B8zSLzuIO/W40QiCmphAtBExAvcGUo67+gqbXiv +403QP11iNaT4yso5ho4z9os6SV8VK3lUKTlxOJpBeGEqE/iWnwWwQAR/AJgcnldk +s9GQlSXPD1cvuw+xZhFEJC0hbvz44Cti2SIVx6JBHgT02GOoefsBi2POBMnc+Vsc +MzuSqypUw7j9MvkgCqN+uy9fJx5s2Z0zlfsBPo39NJ2RfPNaH48eEdSWDtKCQfOH +EPxaHU5dIf1mfZB/oXI/2Cl89vj4za2Uw3PiKxcVDoDPEcHefKoRFoqTchy066Vk +WcbObhzdihZBorlrcxiCbo6KkL5ZDcaEijXR4AZ6I/ixo/bKztWI4MjDmmT3Hwsz +ASuY7NAyYPI75Ajsyt+1g5Ui5+af/BN+Uqmcj9nEhrBi8UBKQKVdmGzej6B6CHzE +405LdQe/S5ujWVg51eGujU4btHND47xm82EsQY/knT4YgZgAnLI= +=kCV0 +-----END PGP SIGNATURE----- diff --git a/merkuro.changes b/merkuro.changes index 9ee5f3b..0aed130 100644 --- a/merkuro.changes +++ b/merkuro.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sun May 19 09:57:34 UTC 2024 - Christophe Marin + +- Update to 24.05.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.05.0/ +- Changes since 24.04.80: + * prevents the recurrence end date combo from eliding + * Make delete dialog background scale with content + * Ensure window is not closed when last job is run + +------------------------------------------------------------------- +Fri May 3 09:17:19 UTC 2024 - Christophe Marin + +- Update to 24.04.80 + * New feature release +- Too many changes since 24.02.2, only listing bugfixes: + * Fix wrong weekday label of Chinese locale when length set to letter only (M) (kde#450571) + ------------------------------------------------------------------- Tue Apr 9 18:09:42 UTC 2024 - Christophe Marin diff --git a/merkuro.spec b/merkuro.spec index 6307276..918f10d 100644 --- a/merkuro.spec +++ b/merkuro.spec @@ -20,19 +20,19 @@ %define kf6_version 6.0.0 %define qt6_version 6.6.0 -%define kpim6_version 6.0.2 +%define kpim6_version 6.0.80 %define plasma6_version 5.27.80 %bcond_without released Name: merkuro -Version: 24.02.2 +Version: 24.05.0 Release: 0 Summary: Calendar Application License: GPL-3.0-only URL: https://apps.kde.org/merkuro.calendar -Source: %{name}-%{version}.tar.xz +Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -Source1: %{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} @@ -62,7 +62,6 @@ BuildRequires: cmake(KPim6MailTransport) >= %{kpim6_version} BuildRequires: cmake(KPim6MimeTreeParserCore) >= %{kpim6_version} BuildRequires: cmake(Plasma) >= %{plasma6_version} BuildRequires: cmake(Qt6Core) >= %{qt6_version} -BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} BuildRequires: cmake(Qt6DBus) >= %{qt6_version} BuildRequires: cmake(Qt6Gui) >= %{qt6_version} BuildRequires: cmake(Qt6Qml) >= %{qt6_version} @@ -81,7 +80,7 @@ Requires: qt6-declarative-imports >= %{qt6_version} Provides: kalendar = %{version} Obsoletes: kalendar < %{version} # merkuro has a runtime dependency on QtWebEngine -ExclusiveArch: x86_64 %x86_64 aarch64 riscv64 +ExclusiveArch: x86_64 aarch64 riscv64 %description Calendar application using Akonadi to sync with external services (NextCloud, GMail, ...).