X-Git-Url: http://git.pld-linux.org/?p=packages%2Fka5-libkgapi.git;a=blobdiff_plain;f=ka5-libkgapi.spec;h=9bf8bf6265b77949ac157ff3a28a1171259825bc;hp=ed2bf1e718c1115206282f765d0a3af5361683d0;hb=HEAD;hpb=79cf3b13fe916cb16794c163405892ff520db6e2

diff --git a/ka5-libkgapi.spec b/ka5-libkgapi.spec
index ed2bf1e..cbd114b 100644
--- a/ka5-libkgapi.spec
+++ b/ka5-libkgapi.spec
@@ -1,18 +1,22 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	22.04.0
-%define		kframever	5.56.0
-%define		qtver		5.9.0
+%bcond_without	webengine	# build without webengine
+%define		kdeappsver	23.08.5
+%define		kframever	5.94.0
+%define		qtver		5.15.2
 %define		kaname		libkgapi
+%ifarch x32
+%undefine	with_webengine
+%endif
 Summary:	libkgapi
 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:	62b8c4c0bc54295132ef5ff885941f98
+Source0:	https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	5ada47924ba45d0b3d914c53c5669b6f
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= 5.11.1
@@ -22,11 +26,11 @@ BuildRequires:	Qt5PrintSupport-devel >= 5.11.1
 BuildRequires:	Qt5Qml-devel >= 5.11.1
 BuildRequires:	Qt5Quick-devel >= 5.11.1
 BuildRequires:	Qt5Test-devel
-BuildRequires:	Qt5WebChannel-devel >= 5.11.1
-BuildRequires:	Qt5WebEngine-devel >= 5.11.1
+%{?with_webengine:BuildRequires:	Qt5WebChannel-devel >= 5.11.1}
+%{?with_webengine:BuildRequires:	Qt5WebEngine-devel >= 5.11.1}
 BuildRequires:	Qt5Widgets-devel
 BuildRequires:	Qt5Xml-devel
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.20
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	gettext-devel
 BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
@@ -37,11 +41,11 @@ BuildRequires:	kf5-kwallet-devel >= %{kframever}
 BuildRequires:	kf5-kwindowsystem-devel >= %{kframever}
 BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
+BuildRequires:	qt5-linguist >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
-ExclusiveArch:	i686  %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,17 +72,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
 
 
@@ -96,45 +98,45 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}_qt.lang
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libKPimGAPIBlogger.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPIBlogger.so.5.*.*
-%ghost %{_libdir}/libKPimGAPICalendar.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPICalendar.so.5.*.*
-%ghost %{_libdir}/libKPimGAPIContacts.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPIContacts.so.5.*.*
-%ghost %{_libdir}/libKPimGAPICore.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPICore.so.5.*.*
-%ghost %{_libdir}/libKPimGAPIDrive.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPIDrive.so.5.*.*
-%ghost %{_libdir}/libKPimGAPILatitude.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPILatitude.so.5.*.*
-%ghost %{_libdir}/libKPimGAPIMaps.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPIMaps.so.5.*.*
-%ghost %{_libdir}/libKPimGAPITasks.so.5
-%attr(755,root,root) %{_libdir}/libKPimGAPITasks.so.5.*.*
-%{_libdir}/sasl2/libkdexoauth2.so.3
-%attr(755,root,root) %{_libdir}/sasl2/libkdexoauth2.so.3.*.*
 %{_datadir}/qlogging-categories5/libkgapi.categories
+%ghost %{_libdir}/libKPim5GAPIBlogger.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPIBlogger.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPICalendar.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPICalendar.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPICore.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPICore.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPIDrive.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPIDrive.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPILatitude.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPILatitude.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPIMaps.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPIMaps.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPIPeople.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPIPeople.so.*.*.*
+%ghost %{_libdir}/libKPim5GAPITasks.so.5
+%attr(755,root,root) %{_libdir}/libKPim5GAPITasks.so.*.*.*
+%ghost %{_libdir}/sasl2/libkdexoauth2.so.3
+%attr(755,root,root) %{_libdir}/sasl2/libkdexoauth2.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/KPim/KGAPI
-%{_includedir}/KPim/kgapi_version.h
-%{_libdir}/cmake/KPimGAPI
-%{_libdir}/libKPimGAPIBlogger.so
-%{_libdir}/libKPimGAPICalendar.so
-%{_libdir}/libKPimGAPIContacts.so
-%{_libdir}/libKPimGAPICore.so
-%{_libdir}/libKPimGAPIDrive.so
-%{_libdir}/libKPimGAPIMaps.so
-%{_libdir}/libKPimGAPILatitude.so
-%{_libdir}/libKPimGAPITasks.so
-%{_libdir}/sasl2/libkdexoauth2.so
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPIBlogger.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPICalendar.pri
-%{_libdir}/qt5/mkspecs/modules/qt_KGAPIContacts.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPICore.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPIDrive.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPILatitude.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPIMaps.pri
 %{_libdir}/qt5/mkspecs/modules/qt_KGAPITasks.pri
+%{_includedir}/KPim5/KGAPI
+%{_libdir}/cmake/KPim5GAPI
+%{_libdir}/cmake/KPimGAPI
+%{_libdir}/libKPim5GAPIBlogger.so
+%{_libdir}/libKPim5GAPICalendar.so
+%{_libdir}/libKPim5GAPICore.so
+%{_libdir}/libKPim5GAPIDrive.so
+%{_libdir}/libKPim5GAPILatitude.so
+%{_libdir}/libKPim5GAPIMaps.so
+%{_libdir}/libKPim5GAPIPeople.so
+%{_libdir}/libKPim5GAPITasks.so
+%{_libdir}/sasl2/libkdexoauth2.so
+%{_libdir}/qt5/mkspecs/modules/qt_KGAPIPeople.pri