Merge branch 'rawhide' into f40

.gitignore

@@ -20,16 +20,3 @@
 /akonadi-24.12.3.tar.xz
 /akonadi-25.03.80.tar.xz
 /akonadi-25.04.0.tar.xz
-/akonadi-25.04.1.tar.xz
-/akonadi-25.04.2.tar.xz
-/akonadi-25.04.3.tar.xz
-/akonadi-25.07.80.tar.xz
-/akonadi-25.07.90.tar.xz
-/akonadi-25.08.0.tar.xz
-/akonadi-25.08.1.tar.xz
-/akonadi-25.08.2.tar.xz
-/akonadi-25.08.3.tar.xz
-/akonadi-25.11.80.tar.xz
-/akonadi-25.11.90.tar.xz
-/akonadi-25.12.0.tar.xz
-/akonadi-25.12.1.tar.xz

akonadi-server.spec

@@ -4,11 +4,11 @@
 
 Name:    akonadi-server
 Summary: PIM Storage Service
-Version: 25.12.1
-Release: 2%{?dist}
+Version: 25.04.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
+URL:     https://invent.kde.org/frameworks/akonadi
 
 Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/akonadi-%{version}.tar.xz
 
@@ -19,8 +19,7 @@ Source11:       akonadiserverrc.sqlite
 
 ## upstreamable patches
 
-## upstream patches
-
+## upstream patches (lookaside cache)
 
 ## downstream patches
 
@@ -29,7 +28,6 @@ Source11:       akonadiserverrc.sqlite
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf6-rpm-macros
 BuildRequires:  qt6-qtbase-devel
-BuildRequires:  desktop-file-utils
 
 BuildRequires:  cmake(KF6ItemViews)
 BuildRequires:  cmake(KF6KIO)
@@ -54,6 +52,9 @@ BuildRequires:  pkgconfig(Qt6Designer)
 BuildRequires:  cmake(AccountsQt6)
 BuildRequires:  cmake(KAccounts6)
 
+# ^^ sqlite3 driver plugin needs versioned qt6 dep
+BuildRequires: qt6-qtbase-private-devel
+
 %if ! 0%{?flatpak}
 BuildRequires: mariadb-server
 %endif
@@ -137,7 +138,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
+
 %find_lang libakonadi6 --all-name --with-html --with-qt
 
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc.mysql
@@ -161,6 +162,7 @@ install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akona
 # omit mysql-global-mobile.conf
 rm -fv %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
 
+
 %post
 /usr/sbin/update-alternatives \
   --install %{_sysconfdir}/xdg/akonadi/akonadiserverrc \
@@ -195,7 +197,6 @@ fi
 %{_kf6_bindir}/akonadi2xml
 %{_kf6_bindir}/akonadiselftest
 %{_kf6_bindir}/akonaditest
-%{_kf6_bindir}/akonadiagentconfigdialog
 %{_kf6_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_kf6_datadir}/mime/packages/akonadi-mime.xml
 %{_kf6_datadir}/akonadi/
@@ -203,11 +204,10 @@ fi
 %{_kf6_datadir}/kf6/akonadi/
 %{_kf6_libdir}/libKPim6Akonadi*.so.*
 %{_kf6_datadir}/icons/hicolor/*/apps/akonadi.*
+
 # akonadi_knut_resource
 %{_kf6_bindir}/akonadi_knut_resource
 %{_kf6_datadir}/kf6/akonadi_knut_resource/
-%{_kf6_qmldir}/org/kde/akonadi/
-%{_kf6_datadir}/applications/org.kde.akonadi.configdialog.desktop
 
 %files devel
 %{_kf6_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
@@ -216,11 +216,9 @@ fi
 %{_includedir}/KPim6/AkonadiCore/
 %{_includedir}/KPim6/AkonadiWidgets/
 %{_includedir}/KPim6/AkonadiXml/
-%{_includedir}/KPim6/AkonadiAgentWidgetBase/
 %{_kf6_libdir}/libKPim6Akonadi*.so
 %{_kf6_libdir}/cmake/KPim6Akonadi/
 %{_kf6_qtplugindir}/pim6/akonadi/akonadi_test_searchplugin.so
-%{_kf6_qtplugindir}/pim6/akonadi/config/knutconfig.so
 %{_kf6_qtplugindir}/designer/akonadi6widgets.so
 %{_kf6_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
 %{_kf6_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2
@@ -250,57 +248,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
-
-* Fri Nov 28 2025 Steve Cossette <farchord@gmail.com> - 25.11.90-1
-- 25.11.90
-
-* Sat Nov 15 2025 Steve Cossette <farchord@gmail.com> - 25.11.80-1
-- 25.11.80
-
-* Tue Nov 04 2025 Steve Cossette <farchord@gmail.com> - 25.08.3-1
-- 25.08.3
-
-* Wed Oct 08 2025 Steve Cossette <farchord@gmail.com> - 25.08.2-1
-- 25.08.2
-
-* Sun Sep 21 2025 Steve Cossette <farchord@gmail.com> - 25.08.1-1
-- 25.08.1
-
-* Fri Aug 15 2025 Alessandro Astone <ales.astone@gmail.com> - 25.08.0-2
-- Backport patch to fix loading the accounts UI
-
-* Fri Aug 08 2025 Steve Cossette <farchord@gmail.com> - 25.08.0-1
-- 25.08.0
-
-* Fri Jul 25 2025 Steve Cossette <farchord@gmail.com> - 25.07.90-1
-- 25.07.90
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 25.07.80-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jul 11 2025 Steve Cossette <farchord@gmail.com> - 25.07.80-1
-- 25.07.80
-
-* Thu Jul 03 2025 Steve Cossette <farchord@gmail.com> - 25.04.3-1
-- 25.04.3
-
-* Wed Jun 04 2025 Steve Cossette <farchord@gmail.com> - 25.04.2-1
-- 25.04.2
-
-* Wed May 14 2025 Steve Cossette <farchord@gmail.com> - 25.04.1-1
-- 25.04.1
-
-* Mon Apr 14 2025 Jan Grulich <jgrulich@redhat.com> - 25.04.0-2
-- Rebuild (qt6)
-
 * Sat Apr 12 2025 Steve Cossette <farchord@gmail.com> - 25.04.0-1
 - 25.04.0
 
@@ -361,6 +308,9 @@ fi
 * Fri May 17 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.05.0-1
 - 24.05.0
 
+* Thu Apr 18 2024 Jan Grulich <jgrulich@redhat.com> - 24.02.2-2
+- Rebuild (qt6)
+
 * Fri Apr 12 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.02.2-1
 - 24.02.2
 

sources

@@ -1 +1 @@
-SHA512 (akonadi-25.12.1.tar.xz) = 6a3ca234b7e63c5e0b22eecd87d2b491915b02cf51bfe5ce1b9d4161dd0cfc664c1c6ebc6e95b797bcdd47756bcf8593ec53419601d4c7112f4ec6be1cb36188
+SHA512 (akonadi-25.04.0.tar.xz) = ccbac4371e9449ccd7107beb4293c3ba764f7db1be3aff609d0cd43152f24ed66c501229daf71bae0d46d9331a5e06947ea7f5f11710d5c213de30b32b9e1936