[packages/ka5-konqueror] - updated to 18.12.1; ninja

witekfl witekfl at pld-linux.org
Sun Jan 13 11:19:32 CET 2019


commit d60ffe81d5a964c334af2c2c997df288509376c4
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sun Jan 13 11:19:27 2019 +0100

    - updated to 18.12.1; ninja

 ka5-konqueror.spec | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/ka5-konqueror.spec b/ka5-konqueror.spec
index 41466b7..69d256e 100644
--- a/ka5-konqueror.spec
+++ b/ka5-konqueror.spec
@@ -1,14 +1,14 @@
-%define		kdeappsver	18.12.0
+%define		kdeappsver	18.12.1
 %define		qtver		5.9.0
 %define		kaname		konqueror
 Summary:	konqueror
 Name:		ka5-%{kaname}
-Version:	18.12.0
+Version:	18.12.1
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Applications
 Source0:	http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	47c261d7ff09fb68957e9dc63cade6c1
+# Source0-md5:	a15e614cadaecace41cbc797f518644e
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5Core-devel >= %{qtver}
@@ -33,6 +33,7 @@ BuildRequires:	kf5-kcrash-devel >= 5.27.0
 BuildRequires:	kf5-kdelibs4support-devel >= 5.27.0
 BuildRequires:	kf5-khtml-devel >= 5.27.0
 BuildRequires:	kf5-kparts-devel
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
@@ -68,14 +69,14 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 install -d build
 cd build
 %cmake \
+	-G Ninja \
 	-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-qm
 
@@ -180,8 +181,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/64x64/actions/validators.png
 %{_iconsdir}/hicolor/64x64/apps/konqueror.png
 %{_iconsdir}/hicolor/64x64/apps/webengine.png
-%{_iconsdir}/oxygen/scalable/actions/htmlvalidator.svgz
-%{_iconsdir}/oxygen/scalable/actions/validators.svgz
+%{_iconsdir}/hicolor/scalable/actions/htmlvalidator.svgz
+%{_iconsdir}/hicolor/scalable/actions/validators.svgz
 %dir %{_datadir}/kcmcss
 %{_datadir}/kcmcss/template.css
 %{_datadir}/kcontrol/pics/onlyone.png
@@ -212,6 +213,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/metainfo/org.kde.konqueror.appdata.xml
 %dir %{_datadir}/webenginepart
 %{_datadir}/webenginepart/error.html
+%dir %{_datadir}/webenginepart/kpartplugins
+%{_datadir}/webenginepart/kpartplugins/akregator_konqfeedicon.desktop
+%{_datadir}/webenginepart/kpartplugins/akregator_konqfeedicon.rc
+%{_datadir}/webenginepart/kpartplugins/autorefresh.desktop
+%{_datadir}/webenginepart/kpartplugins/autorefresh.rc
+%{_datadir}/webenginepart/kpartplugins/khtmlsettingsplugin.desktop
+%{_datadir}/webenginepart/kpartplugins/khtmlsettingsplugin.rc
+%{_datadir}/webenginepart/kpartplugins/khtmltts.desktop
+%{_datadir}/webenginepart/kpartplugins/khtmltts.rc
+%{_datadir}/webenginepart/kpartplugins/plugin_babelfish.rc
+%{_datadir}/webenginepart/kpartplugins/plugin_translator.desktop
+%{_datadir}/webenginepart/kpartplugins/plugin_validators.desktop
+%{_datadir}/webenginepart/kpartplugins/plugin_validators.rc
 
 %files devel
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-konqueror.git/commitdiff/d60ffe81d5a964c334af2c2c997df288509376c4



More information about the pld-cvs-commit mailing list