call qdbus-qt5 instead of qdbus which may be qt4 or not exist (#1661418)

khotkeys-5.14.4-qdbus-qt5.patch

@@ -0,0 +1,29 @@
+diff -up khotkeys-5.14.4/libkhotkeysprivate/actions/dbus_action.cpp.qdbus-qt5 khotkeys-5.14.4/libkhotkeysprivate/actions/dbus_action.cpp
+--- khotkeys-5.14.4/libkhotkeysprivate/actions/dbus_action.cpp.qdbus-qt5	2018-11-27 10:08:32.000000000 -0600
++++ khotkeys-5.14.4/libkhotkeysprivate/actions/dbus_action.cpp	2018-12-24 11:52:28.162986974 -0600
+@@ -133,7 +133,7 @@ void DBusAction::execute()
+         }
+     qDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list;
+     KProcess proc;
+-    proc << "qdbus" << _application << _object << _function << args_list;
++    proc << "qdbus-qt5" << _application << _object << _function << args_list;
+     proc.startDetached();
+     }
+ 
+diff -up khotkeys-5.14.4/test/main.cpp.qdbus-qt5 khotkeys-5.14.4/test/main.cpp
+--- khotkeys-5.14.4/test/main.cpp.qdbus-qt5	2018-11-27 10:08:32.000000000 -0600
++++ khotkeys-5.14.4/test/main.cpp	2018-12-24 11:53:21.975320157 -0600
+@@ -16,10 +16,10 @@ int main(int argc, char** argv)
+     if (reply.value().contains("khotkeys")) {
+         qDebug() << "The khotkeys module is already running.";
+         qDebug() << "To unload it run:";
+-        qDebug() << "qdbus org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys";
++        qDebug() << "qdbus-qt5 org.kde.kded5 /kded org.kde.kded5.unloadModule khotkeys";
+         exit(-1);
+     }
+ 
+     KHotKeysModule module(&app, QVariantList());
+     return app.exec();
+-}
+\ No newline at end of file
++}

khotkeys.spec

@@ -1,6 +1,6 @@
 Name:    khotkeys
 Version: 5.14.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Application to configure hotkeys in KDE
 
 License: GPLv2+
@@ -18,6 +18,9 @@ Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
 ## downstream patches
 # kcm_hotkeys, use qdbusviewer-qt5, see also http://bugs.kde.org/329094
 Patch100: khotkeys-5.4.2-qdbusviewer-qt5.patch
+# use qdbus-qt5 instead of hard-coding (unpathed) qdbus
+# FIXME: make upstreamable
+Patch101: khotkeys-5.14.4-qdbus-qt5.patch
 
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-kcmutils-devel
@@ -36,11 +39,14 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtx11extras-devel
 
 Requires:       kf5-filesystem
+# expects to call qdbus binary (currently in qt5-qttools):
+Requires:       qt5-qttools
 # not sure if we want a hard dep on this (yet) -- rex
 %if 0%{?fedora} > 21
 Recommends:     qt5-qdbusviewer
 %endif
 
+
 # when khotkeys was split out of kde-workspace-4.11.x
 Conflicts:      kde-workspace < 4.11.15-3
 
@@ -99,6 +105,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Mon Dec 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.4-2
+- call qdbus-qt5 instead of qdbus which may be qt4 or not exist (#1661418)
+
 * Tue Nov 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.14.4-1
 - 5.14.4