Merge branch 'master' into f28

plasma-desktop.spec

@@ -4,7 +4,7 @@
 Name:    plasma-desktop
 Summary: Plasma Desktop shell
 Version: 5.13.3
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+ and (GPLv2 or GPLv3)
 URL:     https://cgit.kde.org/%{name}.git
@@ -129,6 +129,8 @@ Requires:       kwin >= %{majmin_ver}
 # kickoff -> edit applications (#1229393)
 Requires:       kmenuedit >= %{majmin_ver}
 
+Requires:       qqc2-desktop-style
+
 # Virtual provides for plasma-workspace
 Provides:       plasmashell(desktop) = %{version}-%{release}
 Provides:       plasmashell = %{version}-%{release}
@@ -242,7 +244,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 %{_libexecdir}/kimpanel-ibus-panel-launcher
 %{_libexecdir}/plasma-changeicons
 %{_libexecdir}/kfontprint
-%{_qt5_prefix}/qml/org/kde/plasma/private
+%{_kf5_qmldir}/org/kde/plasma/private
 %{_kf5_libdir}/libkdeinit5_kaccess.so
 %{_kf5_libdir}/kconf_update_bin/*
 # TODO: -libs subpkg -- rex
@@ -308,6 +310,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.{kfontview,k
 
 
 %changelog
+* Thu Jul 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.13.3-4
+- Requires: qqc2-desktop-style
+
+* Fri Jul 20 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.13.3-3
+- use %%_kf5_qmldir (more)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild