public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/merkuro] epel10: Merge branch f44 into epel10
@ 2026-09-11 17:16 Troy Dawson
0 siblings, 0 replies; 2+ messages in thread
From: Troy Dawson @ 2026-09-11 17:16 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/merkuro
Branch : epel10
Commit : 762bfe3993ed639d205b4300501ef1e30f4e7e6d
Author : Troy Dawson <tdawson@redhat.com>
Date : 2026-09-11T10:16:30-07:00
Stats : +21/-3 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/merkuro/c/762bfe3993ed639d205b4300501ef1e30f4e7e6d?branch=epel10
Log:
Merge branch f44 into epel10
---
diff --git a/.gitignore b/.gitignore
index 7db9fb1..380a32f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,6 @@
/merkuro-26.04.1.tar.xz
/merkuro-26.04.2.tar.xz
/merkuro-26.04.3.tar.xz
+/merkuro-26.07.90.tar.xz
+/merkuro-26.08.0.tar.xz
+/merkuro-26.08.1.tar.xz
diff --git a/merkuro.spec b/merkuro.spec
index c607e72..6576145 100644
--- a/merkuro.spec
+++ b/merkuro.spec
@@ -1,5 +1,5 @@
Name: merkuro
-Version: 26.04.3
+Version: 26.08.1
Release: 1%{?dist}
Summary: A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)
@@ -58,7 +58,7 @@ BuildRequires: cmake(KPim6MailCommon)
BuildRequires: cmake(KPim6MailTransport)
BuildRequires: cmake(KPim6MimeTreeParserCore)
BuildRequires: cmake(KPim6Mbox)
-BuildRequires: cmake(KPim6Mime)
+BuildRequires: cmake(KF6Mime)
BuildRequires: cmake(KF6TextTemplate)
BuildRequires: cmake(KPim6Libkdepim)
BuildRequires: cmake(KPim6AkonadiSearch)
@@ -134,6 +134,21 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.me
%{_kf6_metainfodir}/org.kde.merkuro.metainfo.xml
%changelog
+* Wed Sep 09 2026 Steve Cossette <farchord@gmail.com> - 26.08.1-1
+- 26.08.1
+
+* Fri Aug 14 2026 Steve Cossette <farchord@gmail.com> - 26.08.0-1
+- 26.08.0
+
+* Fri Jul 31 2026 Steve Cossette <farchord@gmail.com> - 26.07.90-1
+- 26.07.90
+
+* Wed Jul 29 2026 Steve Cossette <farchord@gmail.com> - 26.07.80-1
+- 26.07.80
+
+* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 26.04.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
* Tue Jun 30 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-1
- 26.04.3
diff --git a/sources b/sources
index 22edbc5..dbdb3c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (merkuro-26.04.3.tar.xz) = 9416377ee8997c180fbfc50f9d6a27c37ae48b5790b5071c60fc0092a15d48e2c4e004fdf60540ad206f04d93de6cce7e0723db33230c1ee001a50278de7d694
+SHA512 (merkuro-26.08.1.tar.xz) = 023cc46464c00505e60ba9d92f8c4a7c8afbbb68d734937dedfbfe5a7b729d04594f1b49a3fbed88abe42e7a3588285c29831a6f9f9e98cc8bdb361735062c62
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [rpms/merkuro] epel10: Merge branch f44 into epel10
@ 2026-07-30 16:07 Troy Dawson
0 siblings, 0 replies; 2+ messages in thread
From: Troy Dawson @ 2026-07-30 16:07 UTC (permalink / raw)
To: git-commits
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-11 17:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 17:16 [rpms/merkuro] epel10: Merge branch f44 into epel10 Troy Dawson
-- strict thread matches above, loose matches on Subject: below --
2026-07-30 16:07 Troy Dawson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox