public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/merkuro] epel10: Merge branch f44 into epel10
Date: Thu, 30 Jul 2026 16:07:05 GMT [thread overview]
Message-ID: <178542762581.1.11610759414607490996.rpms-merkuro-2c20a09958e2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/merkuro
Branch : epel10
Commit : 2c20a09958e23c82a53fa94955f5bd2e928a858c
Author : Troy Dawson <tdawson@redhat.com>
Date : 2026-07-30T09:06:54-07:00
Stats : +28/-4 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/merkuro/c/2c20a09958e23c82a53fa94955f5bd2e928a858c?branch=epel10
Log:
Merge branch f44 into epel10
---
diff --git a/.gitignore b/.gitignore
index c847fb6..7db9fb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,8 @@
/merkuro-25.12.1.tar.xz
/merkuro-25.12.2.tar.xz
/merkuro-25.12.3.tar.xz
+/merkuro-26.03.80.tar.xz
+/merkuro-26.04.0.tar.xz
+/merkuro-26.04.1.tar.xz
+/merkuro-26.04.2.tar.xz
+/merkuro-26.04.3.tar.xz
diff --git a/merkuro.spec b/merkuro.spec
index 6c97118..c607e72 100644
--- a/merkuro.spec
+++ b/merkuro.spec
@@ -1,5 +1,5 @@
Name: merkuro
-Version: 25.12.3
+Version: 26.04.3
Release: 1%{?dist}
Summary: A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)
@@ -43,9 +43,10 @@ BuildRequires: cmake(KF6XmlGui)
BuildRequires: cmake(KF6Notifications)
BuildRequires: cmake(KF6Crash)
BuildRequires: cmake(KF6Holidays)
+BuildRequires: cmake(KF6SyntaxHighlighting)
BuildRequires: cmake(KF6KirigamiAddons)
-BuildRequires: gpgme-devel
+BuildRequires: cmake(Gpgmepp)
BuildRequires: cmake(KPim6Akonadi)
BuildRequires: cmake(KPim6AkonadiCalendar)
@@ -111,7 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.me
%{_kf6_bindir}/merkuro-contact
%{_kf6_bindir}/merkuro-mail
%{_kf6_qmldir}/org/kde/merkuro/*
-%{_kf6_datadir}/plasma/plasmoids/org.kde.merkuro.contact.applet/
+%{_kf6_qtplugindir}/plasma/applets/org.kde.merkuro.contact.applet.so
%{_kf6_datadir}/applications/org.kde.merkuro.calendar.desktop
%{_kf6_datadir}/applications/org.kde.merkuro.contact.desktop
%{_kf6_datadir}/applications/org.kde.merkuro.mail.desktop
@@ -133,6 +134,24 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.me
%{_kf6_metainfodir}/org.kde.merkuro.metainfo.xml
%changelog
+* Tue Jun 30 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-1
+- 26.04.3
+
+* Wed Jun 03 2026 Steve Cossette <farchord@gmail.com> - 26.04.2-1
+- 26.04.2
+
+* Wed May 06 2026 Steve Cossette <farchord@gmail.com> - 26.04.1-1
+- 26.04.1
+
+* Fri Apr 17 2026 Jan Grulich <jgrulich@redhat.com> - 26.04.0-2
+- Rebuild (qt6)
+
+* Sat Apr 11 2026 Steve Cossette <farchord@gmail.com> - 26.04.0-1
+- 26.04.0
+
+* Mon Mar 16 2026 Steve Cossette <farchord@gmail.com> - 26.03.80-1
+- 26.03.80
+
* Sun Mar 08 2026 Steve Cossette <farchord@gmail.com> - 25.12.3-1
- 25.12.3
diff --git a/sources b/sources
index aa290ea..22edbc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (merkuro-25.12.3.tar.xz) = 61f766d5b06782254d1272621b01c5c39fdc265753255f899de4dd62886b998b0b3e0ae95329b3edc2c45016b930006fe87d5b9e669a412957d81d3501257cf6
+SHA512 (merkuro-26.04.3.tar.xz) = 9416377ee8997c180fbfc50f9d6a27c37ae48b5790b5071c60fc0092a15d48e2c4e004fdf60540ad206f04d93de6cce7e0723db33230c1ee001a50278de7d694
reply other threads:[~2026-07-30 16:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178542762581.1.11610759414607490996.rpms-merkuro-2c20a09958e2@fedoraproject.org \
--to=tdawson@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox