X-Git-Url: https://git.pld-linux.org/?p=packages%2Fka5-akonadi.git;a=blobdiff_plain;f=ka5-akonadi.spec;h=f67a67e45e1f4648747b6cac3f49593e66f93617;hp=f2e1a1fbb1555e78b705fc2c296caa39a869699c;hb=HEAD;hpb=dacc7f067b09e04f9575f3b327479f7c495f0b9c

diff --git a/ka5-akonadi.spec b/ka5-akonadi.spec
index f2e1a1f..f67a67e 100644
--- a/ka5-akonadi.spec
+++ b/ka5-akonadi.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	22.12.1
+%define		kdeappsver	23.08.5
 %define		kfver		5.53.0
 %define		qtver		5.15.2
 %define		kaname		akonadi
 Summary:	Akonadi - The PIM Storage Service
 Name:		ka5-%{kaname}
-Version:	22.12.1
+Version:	23.08.5
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	4f98067fea826e3463561ae9346a31df
+# Source0-md5:	884c64e59f226d4341b074e5069e994c
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
@@ -25,7 +25,7 @@ BuildRequires:	Qt5UiTools-devel >= %{qtver}
 BuildRequires:	Qt5Widgets-devel >= %{qtver}
 BuildRequires:	Qt5Xml-devel >= %{qtver}
 BuildRequires:	boost-devel >= 1.34.0
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	ka5-kaccounts-integration-devel >= %{kdeappsver}
 BuildRequires:	kf5-extra-cmake-modules >= %{kfver}
@@ -97,17 +97,15 @@ Files for apparmor.
 %setup -q -n %{kaname}-%{version}
 
 %build
-install -d build
-cd build
-%cmake -G Ninja \
+%cmake -B build \
+	-G Ninja \
 	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DHTML_INSTALL_DIR=%{_kdedocdir} \
-	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-	..
-%ninja_build
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+%ninja_build -C build
 
 %if %{with tests}
-ctest
+ctest --test-dir build
 %endif
 
 
@@ -116,6 +114,8 @@ rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 install -d $RPM_BUILD_ROOT%{_includedir}/KF5/Akonadi
 install -d $RPM_BUILD_ROOT%{_libdir}/qt5/plugins/pim5/kontact
+install -d $RPM_BUILD_ROOT%{_libdir}/qt5/plugins/pim5/kcms
+install -d $RPM_BUILD_ROOT%{_libdir}/qt5/qml/org/kde/akonadi
 
 %find_lang %{kaname} --all-name --with-kde
 
@@ -137,9 +137,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/xdg/akonadi
 /etc/xdg/akonadi/mysql-global-mobile.conf
 /etc/xdg/akonadi/mysql-global.conf
-%ghost %{_libdir}/libKF5AkonadiPrivate.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiPrivate.so.*.*.*
-%{_libdir}/qt5/plugins/sqldrivers/libqsqlite3.so
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.Control.service
 %{_datadir}/mime/packages/akonadi-mime.xml
@@ -147,14 +144,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/akonadi_knut_resource
 %attr(755,root,root) %{_bindir}/akonadiselftest
 %attr(755,root,root) %{_bindir}/akonaditest
-%ghost %{_libdir}/libKF5AkonadiAgentBase.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiAgentBase.so.*.*.*
-%ghost %{_libdir}/libKF5AkonadiCore.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiCore.so.*.*.*
-%ghost %{_libdir}/libKF5AkonadiWidgets.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiWidgets.so.*.*.*
-%ghost %{_libdir}/libKF5AkonadiXml.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiXml.so.*.*.*
 %dir %{_datadir}/akonadi
 %dir %{_datadir}/akonadi/agents
 %{_datadir}/akonadi/agents/knutresource.desktop
@@ -174,25 +163,44 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/kf5/akonadi_knut_resource/knut-template.xml
 %{_datadir}/qlogging-categories5/akonadi.categories
 %{_datadir}/qlogging-categories5/akonadi.renamecategories
-%attr(755,root,root) %{_libdir}/qt5/plugins/designer/akonadiwidgets.so
 %dir %{_libdir}/qt5/plugins/pim5
 %dir %{_libdir}/qt5/plugins/pim5/akonadi
 %attr(755,root,root) %{_libdir}/qt5/plugins/pim5/akonadi/akonadi_test_searchplugin.so
 %dir %{_libdir}/qt5/plugins/pim5/kontact
+%ghost %{_libdir}/libKPim5AkonadiAgentBase.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiAgentBase.so.5.*.*
+%ghost %{_libdir}/libKPim5AkonadiCore.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiCore.so.5.*.*
+%ghost %{_libdir}/libKPim5AkonadiPrivate.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiPrivate.so.5.*.*
+%ghost %{_libdir}/libKPim5AkonadiWidgets.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiWidgets.so.5.*.*
+%ghost %{_libdir}/libKPim5AkonadiXml.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiXml.so.5.*.*
+%attr(755,root,root) %{_libdir}/qt5/plugins/designer/akonadi5widgets.so
+%dir %{_libdir}/qt5/plugins/pim5/kcms
+%dir %{_libdir}/qt5/qml/org/kde/akonadi
+
+# TODO subpackage
+%{_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
+%{_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/Akonadi
-%{_includedir}/KF5/AkonadiAgentBase
-%{_includedir}/KF5/AkonadiCore
-%{_includedir}/KF5/AkonadiWidgets
-%{_includedir}/KF5/AkonadiXml
+%dir %{_includedir}/KPim5
+%{_includedir}/KPim5/Akonadi
+%{_includedir}/KPim5/AkonadiAgentBase
+%{_includedir}/KPim5/AkonadiCore
+%{_includedir}/KPim5/AkonadiWidgets
+%{_includedir}/KPim5/AkonadiXml
 %{_libdir}/cmake/KF5Akonadi
-%{_libdir}/libKF5AkonadiPrivate.so
-%{_libdir}/libKF5AkonadiAgentBase.so
-%{_libdir}/libKF5AkonadiCore.so
-%{_libdir}/libKF5AkonadiWidgets.so
-%{_libdir}/libKF5AkonadiXml.so
+%{_libdir}/cmake/KPim5Akonadi
+%{_libdir}/libKPim5AkonadiAgentBase.so
+%{_libdir}/libKPim5AkonadiCore.so
+%{_libdir}/libKPim5AkonadiPrivate.so
+%{_libdir}/libKPim5AkonadiWidgets.so
+%{_libdir}/libKPim5AkonadiXml.so
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiAgentBase.pri
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiCore.pri
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiWidgets.pri
@@ -204,3 +212,4 @@ rm -rf $RPM_BUILD_ROOT
 /etc/apparmor.d/mysqld_akonadi
 /etc/apparmor.d/postgresql_akonadi
 /etc/apparmor.d%{_prefix}.bin.akonadiserver
+