X-Git-Url: http://git.pld-linux.org/?p=packages%2Fka5-parley.git;a=blobdiff_plain;f=ka5-parley.spec;h=63072a60387a855f66368f501ff38d895cdb442d;hp=4ef1dee8210d2a443c06d021194b93b3cc92f3d8;hb=f7d998570151c9309161ad911b0f30a226ba3514;hpb=23a17d76b055a47c4b20d414bcda11431de8ef6c

diff --git a/ka5-parley.spec b/ka5-parley.spec
index 4ef1dee..63072a6 100644
--- a/ka5-parley.spec
+++ b/ka5-parley.spec
@@ -1,14 +1,15 @@
-%define		kdeappsver	18.12.0
+%define		kdeappsver	21.04.2
+%define		kframever	5.56.0
 %define		qtver		5.9.0
 %define		kaname		parley
 Summary:	parley
 Name:		ka5-%{kaname}
-Version:	18.12.0
-Release:	1
+Version:	21.04.2
+Release:	2
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Applications
-Source0:	http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	47f5de96b30eb2ecbcaeb40aeec74d24
+Source0:	http://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
+# Source0-md5:	75bbe58684c3c454a611c41ecc41325f
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Concurrent-devel
 BuildRequires:	Qt5Core-devel >= %{qtver}
@@ -26,25 +27,27 @@ BuildRequires:	Qt5WebEngine-devel >= 5.11.1
 BuildRequires:	Qt5Widgets-devel >= 5.11.1
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
-BuildRequires:	ka5-libkeduvocdocument-devel
-BuildRequires:	kf5-extra-cmake-modules >= 5.53.0
-BuildRequires:	kf5-kcmutils-devel >= 5.22
-BuildRequires:	kf5-kconfig-devel >= 5.22
-BuildRequires:	kf5-kcoreaddons-devel >= 5.22
-BuildRequires:	kf5-kcrash-devel >= 5.22
-BuildRequires:	kf5-kdoctools-devel >= 5.22
-BuildRequires:	kf5-ki18n-devel >= 5.22
-BuildRequires:	kf5-kio-devel >= 5.22
-BuildRequires:	kf5-knewstuff-devel >= 5.22
-BuildRequires:	kf5-knotifications-devel >= 5.22
-BuildRequires:	kf5-kross-devel >= 5.22
-BuildRequires:	kf5-kxmlgui-devel >= 5.22
-BuildRequires:	kf5-sonnet-devel >= 5.22
+BuildRequires:	ka5-libkeduvocdocument-devel >= %{kdeapssver}
+BuildRequires:	kf5-extra-cmake-modules >= %{kframever}
+BuildRequires:	kf5-kcmutils-devel >= %{kframever}
+BuildRequires:	kf5-kconfig-devel >= %{kframever}
+BuildRequires:	kf5-kcoreaddons-devel >= %{kframever}
+BuildRequires:	kf5-kcrash-devel >= %{kframever}
+BuildRequires:	kf5-kdoctools-devel >= %{kframever}
+BuildRequires:	kf5-ki18n-devel >= %{kframever}
+BuildRequires:	kf5-kio-devel >= %{kframever}
+BuildRequires:	kf5-knewstuff-devel >= %{kframever}
+BuildRequires:	kf5-knotifications-devel >= %{kframever}
+BuildRequires:	kf5-kross-devel >= %{kframever}
+BuildRequires:	kf5-kxmlgui-devel >= %{kframever}
+BuildRequires:	kf5-sonnet-devel >= %{kframever}
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{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
@@ -82,14 +85,15 @@ hand and is easily usable with scripts
 install -d build
 cd build
 %cmake \
+	-G Ninja \
+	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	..
-%{__make}
+%ninja_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{kaname} --all-name --with-kde
 
@@ -98,8 +102,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kaname}.lang
 %defattr(644,root,root,755)
-/etc/xdg/parley-themes.knsrc
-/etc/xdg/parley.knsrc
 %attr(755,root,root) %{_bindir}/parley
 %{_desktopdir}/org.kde.parley.desktop
 %{_datadir}/config.kcfg/documentsettings.kcfg
@@ -247,3 +249,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/parley/xslt
 %{_datadir}/parley/xslt/flashcards.xsl
 %{_datadir}/parley/xslt/table.xsl
+%{_datadir}/knsrcfiles/parley-themes.knsrc
+%{_datadir}/knsrcfiles/parley.knsrc