diff --git a/khotkeys-5.4.2-qdbusviewer-qt5.patch b/khotkeys-5.4.2-qdbusviewer-qt5.patch new file mode 100644 index 0000000..15e97c5 --- /dev/null +++ b/khotkeys-5.4.2-qdbusviewer-qt5.patch @@ -0,0 +1,15 @@ +diff -up khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp.qdbusviewer-qt5 khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp +--- khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp.qdbusviewer-qt5 2015-10-01 04:41:32.000000000 -0500 ++++ khotkeys-5.4.2/kcm_hotkeys/actions/dbus_action_widget.cpp 2015-10-19 10:42:54.251917280 -0500 +@@ -117,9 +117,9 @@ bool DbusActionWidget::isChanged() const + + void DbusActionWidget::launchDbusBrowser() const + { +- if( KRun::runCommand( "qdbusviewer", window()) == 0 ) ++ if( KRun::runCommand( "qdbusviewer-qt5", window()) == 0 ) + { +- KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" )); ++ KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer-qt5" )); + } + } + diff --git a/khotkeys.spec b/khotkeys.spec index 5c94ca7..613e108 100644 --- a/khotkeys.spec +++ b/khotkeys.spec @@ -1,6 +1,6 @@ Name: khotkeys Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application to configure hotkeys in KDE License: GPLv2+ @@ -14,6 +14,10 @@ URL: https://projects.kde.org/projects/kde/workspace/khotkeys %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +## downstream patches +# kcm_hotkeys, use qdbusviewer-qt5, see also http://bugs.kde.org/329094 +Patch100: khotkeys-5.4.2-qdbusviewer-qt5.patch + BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: kf5-kcmutils-devel @@ -32,6 +36,10 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel Requires: kf5-filesystem +# 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 @@ -56,6 +64,8 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-%{version} +%patch100 -p1 -b .qtdbusviewer-qt5 + %build mkdir %{_target_platform} @@ -91,6 +101,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Oct 19 2015 Rex Dieter 5.4.2-2 +- kcm_hotkeys: use qdbusviewer-qt5, Recommends: qt5-qdbusviewer (kde#329094) + * Thu Oct 01 2015 Rex Dieter - 5.4.2-1 - 5.4.2