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/akonadi-server] epel10: Merge branch f44 into epel10
Date: Fri, 11 Sep 2026 16:51:32 GMT	[thread overview]
Message-ID: <178914549207.1.6999868363368906923.rpms-akonadi-server-d747e63f0a79@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/akonadi-server
Branch : epel10
Commit : d747e63f0a793421afb7e61661208637d9ba343a
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-09-11T09:51:23-07:00
Stats  : +34/-6 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/akonadi-server/c/d747e63f0a793421afb7e61661208637d9ba343a?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index 969f672..955a750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@
 /akonadi-26.04.1.tar.xz
 /akonadi-26.04.2.tar.xz
 /akonadi-26.04.3.tar.xz
+/akonadi-26.07.90.tar.xz
+/akonadi-26.08.0.tar.xz
+/akonadi-26.08.1.tar.xz

diff --git a/akonadi-server.spec b/akonadi-server.spec
index c8504d8..5aa7968 100644
--- a/akonadi-server.spec
+++ b/akonadi-server.spec
@@ -4,8 +4,8 @@
 
 Name:    akonadi-server
 Summary: PIM Storage Service
-Version: 26.04.3
-Release: 2%{?dist}
+Version: 26.08.1
+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
@@ -18,9 +18,6 @@ Source11:       akonadiserverrc.sqlite
 
 
 ## upstreamable patches
-## MySQL is killed by akonadi too fast
-## https://invent.kde.org/pim/akonadi/-/merge_requests/400
-Patch0:         400.patch
 
 ## upstream patches
 
@@ -50,6 +47,14 @@ BuildRequires:  boost-devel
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(shared-mime-info)
 BuildRequires:  pkgconfig(sqlite3) >= 3.6.23
+BuildRequires:  python3-devel
+BuildRequires:  cmake(Shiboken6)
+BuildRequires:  cmake(PySide6)
+BuildRequires:  python3dist(build)
+BuildRequires:  python3dist(setuptools)
+# shiboken spawns clang++ to locate clang's builtin header (resource) dir;
+# without the driver, #include_next <limits.h> fails to find clang's limits.h
+BuildRequires:  clang
 
 ## (some) optional deps
 BuildRequires:  pkgconfig(Qt6Designer)
@@ -145,6 +150,7 @@ find ./po -type f -name libakonadi5.po -execdir mv {} libakonadi6.po \;
 %install
 %cmake_install
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.akonadi.configdialog.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.akonadi.desktop
 %find_lang libakonadi6 --all-name --with-html --with-qt
 
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql
@@ -221,6 +227,9 @@ fi
 %{_kf6_qmldir}/org/kde/akonadi/
 %{_kf6_datadir}/applications/org.kde.akonadi.configdialog.desktop
 %{_userunitdir}/akonadi_control.service
+%{python3_sitearch}/AkonadiCore.cpython-*-linux-gnu.so
+%{_kf6_datadir}/PySide6/typesystems/typesystem_akonadi.xml
+%{_datadir}/applications/org.kde.akonadi.desktop
 
 %files devel
 %{_kf6_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
@@ -237,6 +246,7 @@ fi
 %{_kf6_qtplugindir}/designer/akonadi6widgets.so
 %{_kf6_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
 %{_kf6_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2
+%{_includedir}/PySide6/AkonadiCore/akonadicore_python.h
 
 %files doc
 
@@ -261,6 +271,21 @@ fi
 
 
 %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
+
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 26.04.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Thu Jul 09 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-2
 - Adding a fix for akonadi killing mysql too quickly
 

diff --git a/sources b/sources
index d19d8b5..1d5f9f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (akonadi-26.04.3.tar.xz) = 85036cad939c1b294719b24914a512e5bdb5ab2e173ca4f02433274faa850db2ae383e4c45acf6c33be232d927c37e9e1143516290632ae2c09e5940867188c5
+SHA512 (akonadi-26.08.1.tar.xz) = 0e0d63162625639919f3c0727db25253e1cdee8f8ea309dc61b5e4b1691b2a497541c60860e2c516bed471a00860864ce8d2fb13e0df385d1c32de404611d502

             reply	other threads:[~2026-09-11 16:51 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-11 16:51 Troy Dawson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-07-30 15:35 [rpms/akonadi-server] epel10: Merge branch f44 into epel10 Troy Dawson

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=178914549207.1.6999868363368906923.rpms-akonadi-server-d747e63f0a79@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