diff --git a/merkuro-24.05.2.tar.xz b/merkuro-24.05.2.tar.xz deleted file mode 100644 index 940f101..0000000 --- a/merkuro-24.05.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0d174fc0a79466c87ba1fd0a33c2230e89e781c7303af8ce9b493670052d658 -size 748112 diff --git a/merkuro-24.05.2.tar.xz.sig b/merkuro-24.05.2.tar.xz.sig deleted file mode 100644 index 9f66aaa..0000000 --- a/merkuro-24.05.2.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmaDnPIACgkQu0YzUNbv -Me8VvQ//SiDq36GXLPuRDDBz1i0rnoYm/LC71WU+2BjEID7KpE6WOfyHXt03uXhj -xEs5QRBxAvT3V8eHwzdItwJO9/wdS7PO+ujzpqQb2mTJ7wY0Vjt3R0bh1XdZNt1T -wCRmPrDsFe17SbWe+7w6MpwD7KWGy/UmGbm0wVWs9aqZkv12Jy2mm3oFXNoXjbiP -3aqj44jGFV2DApcNrI9gkW5ns26Gz8I4N2lRqFcbCQ5qCggQGUg6Wy9PL13/CNNN -0R4N58CWtyej5BO4rcPee0JkR1MJdPOTtyY2qT7twLHoqauscf+cnnYHzUJrm+Yw -o/PAHlITmOSxg/Rvg8l8ykydiveWdnSJyLYHGOH3wKxiNL47IYxRPd74H17EKTkd -DGKA/9gVi/iO/0BWSzJ2c5ZlAmmrAaUuGJSVW2w34fBeYNYPXdUMyf+fWD3jkHAV -Jloqwvdwe5/WmoTL99sn9Q/K/kf7FaQ6BYi5LZSIHM5hWrnKIoVQvIoPU7Vglxkt -MuWH1UICdLw2vYXCj44EwvRkBo+g0gA2C++jaYOBweIx909qFlldDmOKCKz63faE -CP5M04KgP7Y+Dia1oNwwknOz3O7wqGxsLWHDykzWt6PAzi3u8vInXU1vEhPaXX3h -Qc18/WaGCEwJHg6nnyUyrqYiI9urjF8/bWi3jy1m8ERiwTDPXaY= -=3IPQ ------END PGP SIGNATURE----- diff --git a/merkuro-24.08.0.tar.xz b/merkuro-24.08.0.tar.xz new file mode 100644 index 0000000..e6c89e6 --- /dev/null +++ b/merkuro-24.08.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:726070bef38453eadd3dee68b68fb294dc215107b98c1a8edb461bad1c9fbdae +size 765740 diff --git a/merkuro-24.08.0.tar.xz.sig b/merkuro-24.08.0.tar.xz.sig new file mode 100644 index 0000000..1c9731e --- /dev/null +++ b/merkuro-24.08.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAma+4KQACgkQu0YzUNbv +Me8+BxAAimc6wGibh29HFnInA8ZAv1k46yZdyqqBOVg2YRBCsVFtiHINGcwIQHGJ +jaHeKfsk4sJW5PUlGOCVwLywMEDV/7Yv9j1SQkdv0lZ6rU1p1fcwgJUSDvtLdEhE +qKHMzBMO2q1F92LLLplMfcIfobUU/uPwZN5lpKysUVtkE+OxrFWM/c6GqfJY6nLh +m+yqnME+zgdny/h7andReRZ1HRPtEwa3GTWGjIBQP2sVs2iTwkRhwUsFczpoC+0E +Wm+UL7dkkbUc2elt8m9tYKiLQc3Jp8aBxjVBxTtg/DURyU6xy1sc1dPwnrrwt+CV +DTlbYWYIjtiMLJkBVax5ZMNpSxK6MDO4zBaTdl4y+1kqsSvXmwn4cbvCrC/b9HKJ +e1Sod01WtKbSW9BkIp6Hjhwa0Wr+XRtlY14b2a/3TVfbDOI5SjmxRYQ8Aa2JguxD +T+GgOrun2N7Vf3oh+D96MhnWvEpysE13CbA/Ignxt5j7vFK4SpQ6y7mtnYFEXNlH +rrUeO3WCInlSKW+w1T/WPxGydPH6+LFA/lOumGwNU3nxDnfR4tR8hWTPmnj57034 +BUVJKU++iduBW6h9V//mo3QpG3VwVZ+rZtmLJ91rOH0nWz4+PcG3zAYy27G/O9LA +znllM7gh/F2Xmv2+c44RnxQGQUWZueRmoDCVvRBMgGJ2pPqVw0c= +=uxRZ +-----END PGP SIGNATURE----- diff --git a/merkuro.changes b/merkuro.changes index 64e0e92..fc6b647 100644 --- a/merkuro.changes +++ b/merkuro.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 19 07:14:41 UTC 2024 - Christophe Marin + +- Update to 24.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/24.08.0/ +- Too many changes since 24.05.2, only listing bugfixes: + * MonthView: Update Basic grid when changing months (kde#477161) + ------------------------------------------------------------------- Tue Jul 2 13:55:11 UTC 2024 - Christophe Marin diff --git a/merkuro.spec b/merkuro.spec index a0a0a80..a87310b 100644 --- a/merkuro.spec +++ b/merkuro.spec @@ -18,14 +18,14 @@ %global __requires_exclude qt6qmlimport\\((org\\.kde\\.merkuro|org\\.kde\\.raven).* -%define kf6_version 6.0.0 +%define kf6_version 6.3.0 %define qt6_version 6.6.0 -%define kpim6_version 6.1.2 +%define kpim6_version 6.2.0 %define plasma6_version 5.27.80 %bcond_without released Name: merkuro -Version: 24.05.2 +Version: 24.08.0 Release: 0 Summary: Calendar Application License: GPL-3.0-only @@ -41,13 +41,15 @@ BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version} BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} BuildRequires: cmake(KF6Contacts) >= %{kf6_version} BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} BuildRequires: cmake(KF6I18n) >= %{kf6_version} BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} BuildRequires: cmake(KF6ItemModels) >= %{kf6_version} BuildRequires: cmake(KF6KIO) >= %{kf6_version} BuildRequires: cmake(KF6Kirigami) >= %{kf6_version} -BuildRequires: cmake(KF6KirigamiAddons) +BuildRequires: cmake(KF6KirigamiAddons) >= 1.2.1 +BuildRequires: cmake(KF6Notifications) >= %{kf6_version} BuildRequires: cmake(KF6QQC2DesktopStyle) >= %{kf6_version} BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version} BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} @@ -119,6 +121,7 @@ This package provides a Plasma widget to view address book contacts. %{_kf6_appstreamdir}/org.kde.merkuro.calendar.metainfo.xml %{_kf6_appstreamdir}/org.kde.merkuro.contact.metainfo.xml %{_kf6_appstreamdir}/org.kde.merkuro.mail.metainfo.xml +%{_kf6_appstreamdir}/org.kde.merkuro.metainfo.xml %{_kf6_bindir}/merkuro-calendar %{_kf6_bindir}/merkuro-contact %{_kf6_bindir}/merkuro-mail @@ -128,6 +131,12 @@ This package provides a Plasma widget to view address book contacts. %{_kf6_iconsdir}/hicolor/*/apps/org.kde.merkuro.*.png %{_kf6_qmldir}/org/kde/akonadi/ %{_kf6_qmldir}/org/kde/merkuro/ +# FIXME: Having these here is kind of broken +%{_kf6_libdir}/libmerkuro_contact_plugin.so.* +%{_kf6_libdir}/libmerkuro_contact_plugin.so +%{_kf6_libdir}/libMerkuroComponents.so.* +%{_kf6_libdir}/libMerkuroComponents.so +%{_kf6_notificationsdir}/merkuro.mail.notifyrc %files plasmoid %dir %{_kf6_plasmadir}/plasmoids