X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=kf5-kcodecs.spec;h=014e02f7cae53b5abaf90a21cf69c48b80a87c9e;hb=0bbd1d3209c8dc4cd13e93a95a36b0e9082b212a;hp=409723ef5b326ccbeb023c9cd3ca0d25a9fdefe5;hpb=5a1cfc7de12e75a93afd1633e8b0e03a1ed4c3de;p=packages%2Fkf5-kcodecs.git

diff --git a/kf5-kcodecs.spec b/kf5-kcodecs.spec
index 409723e..014e02f 100644
--- a/kf5-kcodecs.spec
+++ b/kf5-kcodecs.spec
@@ -1,26 +1,32 @@
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
 # TODO:
 # - runtime Requires if any
-%define		kdeframever	5.43
-%define		qtver		5.4.0
+%define		kdeframever	5.97
+%define		qtver		5.15.2
 %define		kfname		kcodecs
 
 Summary:	String encoding
 Name:		kf5-%{kfname}
-Version:	5.43.0
-Release:	1
+Version:	5.97.0
+Release:	2
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	b6f2fa4dc1cb75887a401183c6981d26
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	c4fda652d325ce599821b898c710105e
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Test-devel >= %{qtver}
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.16
+BuildRequires:	gperf
 BuildRequires:	kf5-extra-cmake-modules >= %{version}
+BuildRequires:	ninja
 BuildRequires:	qt5-linguist >= %{qtver}
-BuildRequires:	rpmbuild(macros) >= 1.164
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+Requires:	Qt5Core >= %{qtver}
 Requires:	kf5-dirs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,7 +44,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe dla programistów używających %{kfname}
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	Qt5Core-devel >= %{qtver}
-Requires:	cmake >= 2.6.0
+Requires:	cmake >= 3.16
 
 %description devel
 Header files for %{kfname} development.
@@ -52,16 +58,20 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
-%{__make}
+%ninja_build
+
+%if %{with tests}
+ctest
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} -C build/ install \
-        DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
@@ -74,14 +84,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{kfname}5_qt.lang
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %ghost %{_libdir}/libKF5Codecs.so.5
+%ghost %{_libdir}/libKF5Codecs.so.5
 %attr(755,root,root) %{_libdir}/libKF5Codecs.so.*.*
-/etc/xdg/kcodecs.categories
+%{_datadir}/qlogging-categories5/kcodecs.categories
+%{_datadir}/qlogging-categories5/kcodecs.renamecategories
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libKF5Codecs.so
+%{_libdir}/libKF5Codecs.so
 %{_includedir}/KF5/KCodecs
-%{_includedir}/KF5/kcodecs_version.h
 %{_libdir}/cmake/KF5Codecs
 %{_libdir}/qt5/mkspecs/modules/qt_KCodecs.pri