X-Git-Url: https://git.pld-linux.org/?p=packages%2Fka5-akonadi-calendar.git;a=blobdiff_plain;f=ka5-akonadi-calendar.spec;h=17219ee218dd79ca40215e9ef0d3545fba816ac0;hp=4286119384ff5e5c1ca05e92b7823ecc7656c0b2;hb=HEAD;hpb=2e1386461344d9741fe50ea24a5955fccde2d8a0

diff --git a/ka5-akonadi-calendar.spec b/ka5-akonadi-calendar.spec
index 4286119..17219ee 100644
--- a/ka5-akonadi-calendar.spec
+++ b/ka5-akonadi-calendar.spec
@@ -1,29 +1,30 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	22.08.0
+%define		kdeappsver	23.08.5
 %define		kframever	5.94.0
 %define		qtver		5.15.2
 %define		kaname		akonadi-calendar
 Summary:	Akonadi Calendar
 Name:		ka5-%{kaname}
-Version:	22.08.0
+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:	0e83c83c8e26b85ca04cccd7999ef5fa
+# Source0-md5:	245f6f0812c14d68ad80e2d5136b9738
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= 5.11.1
 BuildRequires:	Qt5Test-devel >= 5.9.0
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	ka5-akonadi-contacts-devel >= %{kdeappsver}
 BuildRequires:	ka5-akonadi-devel >= %{kdeappsver}
 BuildRequires:	ka5-kcalutils-devel >= %{kdeappsver}
 BuildRequires:	ka5-kidentitymanagement-devel >= %{kdeappsver}
 BuildRequires:	ka5-kmailtransport-devel >= %{kdeappsver}
+BuildRequires:	ka5-messagelib-devel >= %{kdeappsver}
 BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
 BuildRequires:	kf5-kcalendarcore-devel >= %{kframever}
 BuildRequires:	kf5-kcodecs-devel >= %{kframever}
@@ -64,17 +65,15 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 %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
 
 
@@ -92,8 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libKF5AkonadiCalendar.so.5
-%attr(755,root,root) %{_libdir}/libKF5AkonadiCalendar.so.*.*.*
 %attr(755,root,root) %{_libdir}/qt5/plugins/akonadi_serializer_kcalcore.so
 %{_datadir}/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 %{_datadir}/qlogging-categories5/akonadi-calendar.categories
@@ -104,11 +101,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/knotifications5/kalendarac.notifyrc
 %{_datadir}/qlogging-categories5/org_kde_kalendarac.categories
 %dir %{_libdir}/qt5/plugins/kf5/org.kde.kcalendarcore.calendars
-%{_libdir}/qt5/plugins/kf5/org.kde.kcalendarcore.calendars/libakonadicalendarplugin.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/org.kde.kcalendarcore.calendars/libakonadicalendarplugin.so
+%ghost %{_libdir}/libKPim5AkonadiCalendar.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiCalendar.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/cmake/KF5AkonadiCalendar
-%{_libdir}/libKF5AkonadiCalendar.so
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiCalendar.pri
-%{_includedir}/KF5/AkonadiCalendar
+%{_includedir}/KPim5/AkonadiCalendar
+%{_libdir}/cmake/KF5AkonadiCalendar
+%{_libdir}/cmake/KPim5AkonadiCalendar
+%{_libdir}/libKPim5AkonadiCalendar.so