Merge branch f43 into epel10

Merge branch f42 into epel10
2025-12-10 14:21:43 -08:00 · 2025-11-14 19:00:34 -08:00 · 2025-10-06 09:53:18 -07:00 · 2025-09-23 11:30:57 -07:00 · 2025-07-09 08:37:35 -07:00 · 2025-06-26 10:02:35 -07:00
3 changed files with 3 additions and 10 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,4 +32,3 @@
 /akonadi-25.11.80.tar.xz
 /akonadi-25.11.90.tar.xz
 /akonadi-25.12.0.tar.xz
-/akonadi-25.12.1.tar.xz
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@ -4,8 +4,8 @@

 Name:    akonadi-server
 Summary: PIM Storage Service
-Version: 25.12.1
-Release: 2%{?dist}
+Version: 25.12.0
+Release: 1%{?dist}

 License: BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 URL:     https://invent.kde.org/pim/akonadi
@ -250,12 +250,6 @@ fi


 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 25.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jan 07 2026 farchord@gmail.com - 25.12.1-1
- 25.12.1
-
 * Sat Dec 06 2025 Steve Cossette <farchord@gmail.com> - 25.12.0-1
 - 25.12.0

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (akonadi-25.12.1.tar.xz) = 6a3ca234b7e63c5e0b22eecd87d2b491915b02cf51bfe5ce1b9d4161dd0cfc664c1c6ebc6e95b797bcdd47756bcf8593ec53419601d4c7112f4ec6be1cb36188
+SHA512 (akonadi-25.12.0.tar.xz) = 73a5a614504fb352410d138f155b798731aa15e796203e45ee44705fb6279f594d1e2aed00f9cea7f27686c7affbadb67c3e55f5e6b339f67ade76dc03698359
Author	SHA1	Message	Date
Troy Dawson	738176917a	Merge branch f43 into epel10	2025-12-10 14:21:43 -08:00
Troy Dawson	5494df8e5c	Merge branch f42 into epel10	2025-11-14 19:00:34 -08:00
Troy Dawson	9730fc8a77	Merge branch f42 into epel10	2025-10-06 09:53:18 -07:00
Troy Dawson	fd1b545b48	Merge branch f42 into epel10	2025-09-23 11:30:57 -07:00
Troy Dawson	9e461f3b33	Merge branch f42 into epel10	2025-07-09 08:37:35 -07:00
Troy Dawson	f680f52c21	Merge branch f42 into epel10	2025-06-26 10:02:35 -07:00
Troy Dawson	4d363588e1	Merge branch f41 into epel10	2025-04-04 09:56:08 -07:00
Troy Dawson	0e3ae2a56d	Merge branch f41 into epel10	2025-02-11 07:20:40 -08:00
Troy Dawson	ca658b6986	Merge branch f41 into epel10	2024-12-18 10:03:26 -08:00
Troy Dawson	52d83f9631	sync with f41	2024-11-18 14:27:51 -08:00
Troy Dawson	d645be906c	Merge branch f41 into epel10	2024-11-18 10:29:37 -08:00
Steve Cossette	cb8be7cfd3	Merge branch 'f41' into f40	2024-08-23 17:32:03 -04:00
Marc Deop i Argemí	c8688b48f4	Merge branch 'rawhide' into f40	2024-07-12 21:22:40 +02:00
Marc Deop i Argemí	7ddd282536	Merge branch 'rawhide' into f40	2024-06-02 16:56:33 +02:00
Jan Grulich	9aae9abdec	Rebuild (qt6)	2024-04-18 09:08:21 +02:00