[packages/ka5-pimcommon] - updated to 23.08.0; cmake -B build

witekfl witekfl at pld-linux.org
Thu Aug 24 18:16:32 CEST 2023


commit 9a131ceabc9ef3076bce420b35fb710c08c6e109
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Thu Aug 24 17:46:37 2023 +0200

    - updated to 23.08.0; cmake -B build

 ka5-pimcommon.spec | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/ka5-pimcommon.spec b/ka5-pimcommon.spec
index 604521c..eb20b6d 100644
--- a/ka5-pimcommon.spec
+++ b/ka5-pimcommon.spec
@@ -1,18 +1,18 @@
 #
 # Conditional build:
 %bcond_with	tests		# build with tests
-%define		kdeappsver	23.04.3
+%define		kdeappsver	23.08.0
 %define		kframever	5.94.0
 %define		qtver		5.15.2
 %define		kaname		pimcommon
 Summary:	Common PIM libraries
 Name:		ka5-%{kaname}
-Version:	23.04.3
+Version:	23.08.0
 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:	73bcced5e61abf0460fdbce809127409
+# Source0-md5:	aa9b11aa38df496e6e75b0a09fb14bf6
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel
@@ -24,7 +24,7 @@ BuildRequires:	Qt5Test-devel
 BuildRequires:	Qt5UiTools-devel >= 5.11.1
 BuildRequires:	Qt5Widgets-devel
 BuildRequires:	Qt5Xml-devel
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.20
 BuildRequires:	gettext-devel
 BuildRequires:	grantlee-qt5-devel >= 5.1
 BuildRequires:	ka5-akonadi-contacts-devel >= %{kdeappsver}
@@ -85,17 +85,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
 
 
@@ -115,20 +113,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_datadir}/qlogging-categories5/pimcommon.categories
 %{_datadir}/qlogging-categories5/pimcommon.renamecategories
-%ghost %{_libdir}/libKF5PimCommon.so.5
-%attr(755,root,root) %{_libdir}/libKF5PimCommon.so.*.*.*
-%ghost %{_libdir}/libKF5PimCommonAkonadi.so.5
-%attr(755,root,root) %{_libdir}/libKF5PimCommonAkonadi.so.*.*.*
 %attr(755,root,root) %{_libdir}/qt5/plugins/designer/pimcommon5akonadiwidgets.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/designer/pimcommon5widgets.so
+%ghost %{_libdir}/libKPim5PimCommon.so.5
+%attr(755,root,root) %{_libdir}/libKPim5PimCommon.so.5.*.*
+%ghost %{_libdir}/libKPim5PimCommonAkonadi.so.5
+%attr(755,root,root) %{_libdir}/libKPim5PimCommonAkonadi.so.5.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/qt5/mkspecs/modules/qt_PimCommon.pri
 %{_libdir}/qt5/mkspecs/modules/qt_PimCommonAkonadi.pri
-%{_includedir}/KF5/PimCommon
-%{_includedir}/KF5/PimCommonAkonadi
-%{_libdir}/cmake/KF5PimCommon
-%{_libdir}/cmake/KF5PimCommonAkonadi
-%{_libdir}/libKF5PimCommon.so
-%{_libdir}/libKF5PimCommonAkonadi.so
+%{_includedir}/KPim5/PimCommon
+%{_includedir}/KPim5/PimCommonAkonadi
+%{_libdir}/cmake/KPim5PimCommon
+%{_libdir}/cmake/KPim5PimCommonAkonadi
+%{_libdir}/libKPim5PimCommon.so
+%{_libdir}/libKPim5PimCommonAkonadi.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-pimcommon.git/commitdiff/9a131ceabc9ef3076bce420b35fb710c08c6e109



More information about the pld-cvs-commit mailing list