X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kp5-discover.spec;h=dad267a13d915959de540956fdc3d05c4639b3b7;hb=e6faa2a732e59ede6ea1b2613a4190eae1ce2311;hp=fd9efc48b68a23351108be588e0fddb57aceb126;hpb=c3aa0026d1023ddb1f0d7ed9b3ffa402f7ea41f0;p=packages%2Fkp5-discover.git

diff --git a/kp5-discover.spec b/kp5-discover.spec
index fd9efc4..dad267a 100644
--- a/kp5-discover.spec
+++ b/kp5-discover.spec
@@ -1,16 +1,19 @@
-%define		kdeplasmaver	5.24.2
-%define		qtver		5.9.0
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
+%define		kdeplasmaver	5.27.5
+%define		qtver		5.15.2
 %define		kpname		discover
 Summary:	discover
 Name:		kp5-%{kpname}
-Version:	5.24.2.1
+Version:	5.27.5
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5:	a0e0b28ea379c0768c59f6de191903e2
+Source0:	https://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
+# Source0-md5:	3f192d5ae11e72dedee2686ca1fd5133
 URL:		http://www.kde.org/
-BuildRequires:	AppStream-qt-devel
+BuildRequires:	AppStream-qt-devel >= 0.15.3
 BuildRequires:	Qt5Concurrent-devel >= %{qtver}
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
@@ -20,6 +23,7 @@ BuildRequires:	Qt5Qml-devel >= %{qtver}
 BuildRequires:	Qt5Quick-devel >= %{qtver}
 BuildRequires:	Qt5Svg-devel >= %{qtver}
 BuildRequires:	Qt5Test-devel >= %{qtver}
+BuildRequires:	Qt5WebView-devel >= %{qtver}
 BuildRequires:	Qt5Widgets-devel >= %{qtver}
 BuildRequires:	Qt5Xml-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
@@ -44,6 +48,7 @@ BuildRequires:	kf5-knotifications-devel
 BuildRequires:	kf5-ktextwidgets-devel
 BuildRequires:	kf5-kwallet-devel
 BuildRequires:	kf5-kwidgetsaddons-devel
+BuildRequires:	kf5-purpose-devel
 BuildRequires:	kf5-solid-devel
 BuildRequires:	libmarkdown-devel
 BuildRequires:	ninja
@@ -51,6 +56,8 @@ BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+Suggests:	flatpak
+Suggests:	fwupd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,15 +70,23 @@ discover
 install -d build
 cd build
 %cmake -G Ninja \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 	..
 %ninja_build
 
+%if %{with tests}
+ctest
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
+
 %find_lang discover --all-name --with-kde
 
 %clean
@@ -80,13 +95,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -f discover.lang
 %defattr(644,root,root,755)
 %dir %{_libdir}/qt5/plugins/discover
-%dir %{_libdir}/qt5/plugins/discover-notifier
-%attr(755,root,root) %{_libdir}/qt5/plugins/discover/kns-backend.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/discover-notifier/FlatpakNotifier.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/discover/flatpak-backend.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/discover/fwupd-backend.so
 %{_desktopdir}/org.kde.discover.desktop
-%{_desktopdir}/org.kde.discover-flatpak.desktop
 %attr(755,root,root) %{_bindir}/plasma-discover
 %{_libdir}/plasma-discover
 %{_desktopdir}/org.kde.discover.urlhandler.desktop
@@ -96,11 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_iconsdir}/hicolor/32x32/apps/plasmadiscover.png
 %{_iconsdir}/hicolor/48x48/apps/plasmadiscover.png
 %{_iconsdir}/hicolor/scalable/apps/plasmadiscover.svg*
-%{_iconsdir}/hicolor/scalable/apps/flatpak-discover.svg
 %dir %{_datadir}/kxmlgui5/plasmadiscover
 %{_datadir}/kxmlgui5/plasmadiscover/plasmadiscoverui.rc
 %{_datadir}/metainfo/org.kde.discover.appdata.xml
-%{_datadir}/metainfo/org.kde.discover.flatpak.appdata.xml
 /etc/xdg/autostart/org.kde.discover.notifier.desktop
 %attr(755,root,root) %{_libexecdir}/DiscoverNotifier
 %{_desktopdir}/org.kde.discover.notifier.desktop
@@ -112,7 +120,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/kpackage/kcms/kcm_updates/contents
 %dir %{_datadir}/kpackage/kcms/kcm_updates/contents/ui
 %{_datadir}/kpackage/kcms/kcm_updates/contents/ui/main.qml
+%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/kcm_updates.so
+%{_desktopdir}/kcm_updates.desktop
+%dir %{_libdir}/qt5/plugins/discover-notifier
+%{_libdir}/qt5/plugins/discover-notifier/FlatpakNotifier.so
+%{_libdir}/qt5/plugins/discover/flatpak-backend.so
+%{_libdir}/qt5/plugins/discover/kns-backend.so
+%{_desktopdir}/org.kde.discover-flatpak.desktop
+%{_iconsdir}/hicolor/scalable/apps/flatpak-discover.svg
 %dir %{_datadir}/libdiscover
 %dir %{_datadir}/libdiscover/categories
 %{_datadir}/libdiscover/categories/flatpak-backend-categories.xml
-%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/kcm_updates.so
+%{_datadir}/metainfo/org.kde.discover.flatpak.appdata.xml