X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kf5-sonnet.spec;h=e7734bdfaa8157cc4442374e4bd8b08ddd47ebbe;hb=cb2bcfd6cc6a88d2924a85d8e734cd0042592c6f;hp=eac4a04aee8af6a9bc7668022ddcc8daec68650e;hpb=3557adced2181c6eaaa706c1924935212b0c3279;p=packages%2Fkf5-sonnet.git

diff --git a/kf5-sonnet.spec b/kf5-sonnet.spec
index eac4a04..e7734bd 100644
--- a/kf5-sonnet.spec
+++ b/kf5-sonnet.spec
@@ -1,32 +1,35 @@
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
 # TODO:
 # - fix build with aspell
-%define		kdeframever	5.80
-%define		qtver		5.14.0
+%define		kdeframever	5.114
+%define		qtver		5.15.2
 %define		kfname		sonnet
 
 Summary:	Multi-language spell checker
 Summary(pl.UTF-8):	Wielojęzyczne narzędzie do sprawdzania pisowni
 Name:		kf5-%{kfname}
-Version:	5.80.0
+Version:	5.114.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	4ff46551537d4ea6ef3ef0d0212e925a
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	57b2211d1c7ed7b6fce10912791399db
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Test-devel >= %{qtver}
 BuildRequires:	Qt5Widgets-devel >= %{qtver}
 BuildRequires:	aspell
 BuildRequires:	aspell-devel
-BuildRequires:	cmake >= 3.5
+BuildRequires:	cmake >= 3.16
 BuildRequires:	hspell-devel
 BuildRequires:	hunspell-devel
 BuildRequires:	kf5-extra-cmake-modules >= %{version}
 BuildRequires:	libvoikko-devel
 BuildRequires:	ninja
 BuildRequires:	qt5-linguist >= %{qtver}
-BuildRequires:	rpmbuild(macros) >= 1.164
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	zlib-devel
@@ -76,12 +79,17 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %setup -q -n %{kfname}-%{version}
 
 %build
-install -d build
-cd build
-%cmake -G Ninja \
-	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-	../
-%ninja_build
+%cmake -B build \
+	-G Ninja \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
+	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+
+%ninja_build -C build
+
+%if %{with tests}
+%ninja_build -C build test
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{qt5dir}/plugins/kf5/sonnet/sonnet_hspell.so
 %attr(755,root,root) %{qt5dir}/plugins/kf5/sonnet/sonnet_hunspell.so
 %attr(755,root,root) %{qt5dir}/plugins/kf5/sonnet/sonnet_voikko.so
+%attr(755,root,root) %{_libdir}/qt5/qml/org/kde/sonnet/libsonnetquickplugin.so
+%dir %{_libdir}/qt5/qml/org/kde/sonnet
+%{_libdir}/qt5/qml/org/kde/sonnet/plugins.qmltypes
+%{_libdir}/qt5/qml/org/kde/sonnet/qmldir
 %attr(755,root,root) %{qt5dir}/plugins/designer/sonnetui5widgets.so
 %{_datadir}/qlogging-categories5/sonnet.categories
 %{_datadir}/qlogging-categories5/sonnet.renamecategories
@@ -117,7 +129,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/KF5/SonnetCore
 %{_includedir}/KF5/SonnetUi
-%{_includedir}/KF5/sonnet_version.h
+%{_includedir}/KF5/Sonnet
 %{_libdir}/cmake/KF5Sonnet
 %{_libdir}/libKF5SonnetCore.so
 %{_libdir}/libKF5SonnetUi.so