X-Git-Url: https://git.pld-linux.org/?p=packages%2Fka5-akonadi-contacts.git;a=blobdiff_plain;f=ka5-akonadi-contacts.spec;h=a1f64fc7cb10651506d5d684ae7291e82cc6aca7;hp=4bd704fa8dfb1de5fb83c1d0e54661cf078d1b3c;hb=HEAD;hpb=038a066868e85c815457c8638e8fb080a2483704

diff --git a/ka5-akonadi-contacts.spec b/ka5-akonadi-contacts.spec
index 4bd704f..a1f64fc 100644
--- a/ka5-akonadi-contacts.spec
+++ b/ka5-akonadi-contacts.spec
@@ -1,23 +1,23 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	22.04.0
-%define		qtver		5.9.0
+%define		kdeappsver	23.08.5
+%define		qtver		5.15.2
 %define		kaname		akonadi-contacts
 Summary:	Akonadi Contacts
 Name:		ka5-%{kaname}
-Version:	22.04.0
+Version:	23.08.5
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	fe5060b320ba66013a9655dbee70c83f
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	e4b501e5a6fedcb972b3ff2c31e8577a
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= 5.11.1
 BuildRequires:	Qt5Test-devel
 BuildRequires:	Qt5Widgets-devel
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	gpgme-qt5-devel
 BuildRequires:	ka5-akonadi-devel >= %{kdeappsver}
@@ -64,17 +64,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,31 +90,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libKF5AkonadiContact.so.5
-%{_libdir}/libKF5AkonadiContact.so.5.*.*
-%ghost %{_libdir}/libKF5ContactEditor.so.5
-%{_libdir}/libKF5ContactEditor.so.5.*.*
-%{_libdir}/qt5/plugins/akonadi/contacts
-%{_libdir}/qt5/plugins/akonadi_serializer_addressee.so
-%{_libdir}/qt5/plugins/akonadi_serializer_contactgroup.so
-%dir %{_libdir}/qt5/plugins/pim
-%dir %{_libdir}/qt5/plugins/pim/kcms
-%dir %{_libdir}/qt5/plugins/pim/kcms/kaddressbook
-%{_libdir}/qt5/plugins/pim/kcms/kaddressbook/kcm_akonadicontact_actions.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/akonadi_serializer_addressee.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/akonadi_serializer_contactgroup.so
 %{_datadir}/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 %{_datadir}/akonadi/plugins/serializer/akonadi_serializer_contactgroup.desktop
 %{_datadir}/kf5/akonadi/contact
-%{_datadir}/kservices5/akonadicontact_actions.desktop
 %{_datadir}/qlogging-categories5/akonadi-contacts.categories
 %{_datadir}/qlogging-categories5/akonadi-contacts.renamecategories
+%ghost %{_libdir}/libKPim5AkonadiContact.so.5
+%attr(755,root,root) %{_libdir}/libKPim5AkonadiContact.so.*.*.*
+%ghost %{_libdir}/libKPim5ContactEditor.so.5
+%attr(755,root,root) %{_libdir}/libKPim5ContactEditor.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/cmake/KF5AkonadiContact
-%{_libdir}/cmake/KF5ContactEditor
-%{_libdir}/libKF5AkonadiContact.so
-%{_libdir}/libKF5ContactEditor.so
 %{_libdir}/qt5/mkspecs/modules/qt_AkonadiContact.pri
 %{_libdir}/qt5/mkspecs/modules/qt_ContactEditor.pri
-%{_includedir}/KF5/AkonadiContact
-%{_includedir}/KF5/AkonadiContactEditor
+%{_includedir}/KPim5/AkonadiContact
+%{_includedir}/KPim5/AkonadiContactEditor
+%{_libdir}/cmake/KF5AkonadiContactEditor
+%{_libdir}/cmake/KPim5AkonadiContact
+%{_libdir}/cmake/KPim5ContactEditor
+%{_libdir}/libKPim5AkonadiContact.so
+%{_libdir}/libKPim5ContactEditor.so