- updated to 23.08.5

[packages/ka5-pimcommon.git] / ka5-pimcommon.spec

diff --git a/ka5-pimcommon.spec b/ka5-pimcommon.spec
index 2a95e1e2fb2bf777270b5717e55cc670670c48d6..b0b2aafa8f583bebfbee9197ab049bc7888730a1 100644 (file)
--- a/ka5-pimcommon.spec
+++ b/ka5-pimcommon.spec
@@ -1,18 +1,18 @@
 #
 # 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          pimcommon
 Summary:       Common PIM libraries
 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: 2c95c9c6bbaa2088aa0cf1851b6e8488
+# Source0-md5: 1fc440ae9f505f70392ac3c8749b134a
 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}
@@ -53,6 +53,7 @@ BuildRequires:        kf5-kservice-devel >= %{kframever}
 BuildRequires: kf5-kwidgetsaddons-devel >= %{kframever}
 BuildRequires: kf5-kxmlgui-devel >= %{kframever}
 BuildRequires: kf5-purpose-devel >= %{kframever}
+BuildRequires: ktextaddons-devel
 BuildRequires: libxslt-progs
 BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
@@ -84,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
 
 
@@ -112,22 +111,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
-%ghost %{_libdir}/libKF5PimCommon.so.5
-%attr(755,root,root) %{_libdir}/libKF5PimCommon.so.5.*.*
-%ghost %{_libdir}/libKF5PimCommonAkonadi.so.5
-%attr(755,root,root) %{_libdir}/libKF5PimCommonAkonadi.so.5.*.*
-%attr(755,root,root) %{_libdir}/qt5/plugins/designer/pimcommonwidgets.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/designer/pimcommonakonadiwidgets.so
 %{_datadir}/qlogging-categories5/pimcommon.categories
 %{_datadir}/qlogging-categories5/pimcommon.renamecategories
+%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)
-%{_includedir}/KF5/PimCommon
-%{_includedir}/KF5/PimCommonAkonadi
-%{_libdir}/cmake/KF5PimCommon
-%{_libdir}/cmake/KF5PimCommonAkonadi
-%{_libdir}/libKF5PimCommon.so
-%{_libdir}/libKF5PimCommonAkonadi.so
 %{_libdir}/qt5/mkspecs/modules/qt_PimCommon.pri
 %{_libdir}/qt5/mkspecs/modules/qt_PimCommonAkonadi.pri
+%{_includedir}/KPim5/PimCommon
+%{_includedir}/KPim5/PimCommonAkonadi
+%{_libdir}/cmake/KPim5PimCommon
+%{_libdir}/cmake/KPim5PimCommonAkonadi
+%{_libdir}/libKPim5PimCommon.so
+%{_libdir}/libKPim5PimCommonAkonadi.so