-%define kdeplasmaver 5.5.4
-%define qtver 5.5.1
+%define kdeplasmaver 5.23.3
+%define qtver 5.9.0
%define kpname discover
Summary: discover
Name: kp5-%{kpname}
-Version: 5.5.4
+Version: 5.23.3
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: 277ad0f67e0b101d109e93a03902bf49
+# Source0-md5: 210e35c1279a1260d82e8e618c1bf88f
URL: http://www.kde.org/
BuildRequires: Qt5Concurrent-devel >= %{qtver}
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: kf5-kdeclarative-devel
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kidletime-devel
BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kitemmodels-devel
BuildRequires: kf5-kitemviews-devel
BuildRequires: kf5-knewstuff-devel
BuildRequires: kf5-knotifications-devel
BuildRequires: kf5-kwallet-devel
BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-solid-devel
+BuildRequires: ninja
BuildRequires: qt5-build >= %{qtver}
BuildRequires: rpmbuild(macros) >= 1.164
BuildRequires: tar >= 1:1.22
%build
install -d build
cd build
-%cmake \
+%cmake -G Ninja \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DHTML_INSTALL_DIR=%{_kdedocdir} \
..
-%{__make}
+%ninja_build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
%find_lang discover --all-name --with-kde
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
%files -f discover.lang
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/muon-discover
-%attr(755,root,root) %{_bindir}/muon-updater
-%attr(755,root,root) %{_libdir}/libDiscoverCommon.so
-%attr(755,root,root) %{_libdir}/libDiscoverNotifiers.so
+%dir %{_libdir}/qt5/plugins/discover
%attr(755,root,root) %{_libdir}/qt5/plugins/discover/kns-backend.so
-%attr(755,root,root) %{_libdir}/qt5/qml/org/kde/discover/libdiscoverdeclarativeplugin.so
-%{_libdir}/qt5/qml/org/kde/discover/qmldir
-%attr(755,root,root) %{_libdir}/qt5/qml/org/kde/discovernotifier/libDiscoverNotifierDeclarativePlugin.so
-%{_libdir}/qt5/qml/org/kde/discovernotifier/qmldir
-%{_desktopdir}/muon-updater.desktop
%{_desktopdir}/org.kde.discover.desktop
-%{_iconsdir}/hicolor/128x128/apps/muondiscover.png
-%{_iconsdir}/hicolor/16x16/apps/muondiscover.png
-%{_iconsdir}/hicolor/22x22/apps/muondiscover.png
-%{_iconsdir}/hicolor/32x32/apps/muondiscover.png
-%{_iconsdir}/hicolor/48x48/apps/muondiscover.png
-%{_iconsdir}/hicolor/scalable/apps/muondiscover.svgz
-%{_datadir}/knotifications5/muonabstractnotifier.notifyrc
-%{_datadir}/kservices5/plasma-applet-org.kde.discovernotifier.desktop
-%{_datadir}/kxmlgui5/muondiscover/muondiscoverui.rc
-%{_datadir}/kxmlgui5/muonupdater/muonupdaterui.rc
-%{_datadir}/libdiscover/backends/knscomics-backend.desktop
-%{_datadir}/libdiscover/backends/knsplasmoids-backend.desktop
-%{_datadir}/libdiscover/categories/knscomics-backend-categories.xml
-%{_datadir}/libdiscover/categories/knsplasmoids-backend-categories.xml
-%{_datadir}/muondiscover/featured.json
-%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/contents/ui/Full.qml
-%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/contents/ui/main.qml
-%{_datadir}/plasma/plasmoids/org.kde.discovernotifier/metadata.desktop
+%attr(755,root,root) %{_bindir}/plasma-discover
+%{_libdir}/plasma-discover
+%{_desktopdir}/org.kde.discover.urlhandler.desktop
+%{_iconsdir}/hicolor/128x128/apps/plasmadiscover.png
+%{_iconsdir}/hicolor/16x16/apps/plasmadiscover.png
+%{_iconsdir}/hicolor/22x22/apps/plasmadiscover.png
+%{_iconsdir}/hicolor/32x32/apps/plasmadiscover.png
+%{_iconsdir}/hicolor/48x48/apps/plasmadiscover.png
+%{_iconsdir}/hicolor/scalable/apps/plasmadiscover.svg*
+%dir %{_datadir}/kxmlgui5/plasmadiscover
+%{_datadir}/kxmlgui5/plasmadiscover/plasmadiscoverui.rc
+%{_datadir}/metainfo/org.kde.discover.appdata.xml
+/etc/xdg/autostart/org.kde.discover.notifier.desktop
+%attr(755,root,root) %{_libexecdir}/DiscoverNotifier
+%{_desktopdir}/org.kde.discover.notifier.desktop
+%{_datadir}/knotifications5/discoverabstractnotifier.notifyrc
+%{_datadir}/qlogging-categories5/discover.categories
+%attr(755,root,root) %{_bindir}/plasma-discover-update
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_updates.so
+%{_desktopdir}/org.kde.discover.snap.desktop
+%dir %{_datadir}/kpackage/kcms/kcm_updates
+%dir %{_datadir}/kpackage/kcms/kcm_updates/contents
+%dir %{_datadir}/kpackage/kcms/kcm_updates/contents/ui
+%{_datadir}/kpackage/kcms/kcm_updates/contents/ui/main.qml
+%{_datadir}/kpackage/kcms/kcm_updates/metadata.desktop
+%{_datadir}/kpackage/kcms/kcm_updates/metadata.json
+%{_datadir}/kservices5/kcm_updates.desktop