Hello community, here is the log from the commit of package khotkeys5 for openSUSE:Factory checked in at 2014-10-25 08:33:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khotkeys5 (Old) and /work/SRC/openSUSE:Factory/.khotkeys5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khotkeys5" Changes: -------- --- /work/SRC/openSUSE:Factory/khotkeys5/khotkeys5.changes 2014-10-15 08:51:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.khotkeys5.new/khotkeys5.changes 2014-10-25 11:12:25.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Oct 24 11:24:14 UTC 2014 - tchva...@suse.com + +- Clean up with spec-cleaner +- Recommend lang pkg +- Add patch to atually make setting the hotkeys setting to work: + * khotkeys5-make-it-work.patch + +------------------------------------------------------------------- New: ---- khotkeys5-make-it-work.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khotkeys5.spec ++++++ --- /var/tmp/diff_new_pack.J4IQrK/_old 2014-10-25 11:12:26.000000000 +0200 +++ /var/tmp/diff_new_pack.J4IQrK/_new 2014-10-25 11:12:26.000000000 +0200 @@ -25,6 +25,8 @@ Url: http://www.kde.org Source: khotkeys-%{version}.1.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM scarab...@suse.cz Fix the hotkey settings, taken from git will be in 5.1.1 +Patch0: khotkeys5-make-it-work.patch BuildRequires: gcc-c++ BuildRequires: kcmutils-devel BuildRequires: kdbusaddons-devel @@ -39,6 +41,7 @@ BuildRequires: xz BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 BuildRequires: pkgconfig(x11) +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -56,8 +59,10 @@ keyboard shortcuts and mouse gestures. Development files. %lang_package + %prep %setup -q -n khotkeys-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 ++++++ khotkeys5-make-it-work.patch ++++++ --- a/libkhotkeysprivate/shortcuts_handler.cpp +++ b/libkhotkeysprivate/shortcuts_handler.cpp @@ -89,7 +89,7 @@ newAction->setProperty("isConfigurationAction", QVariant(true)); } newAction->setText(text); - KGlobalAccel::self()->setDefaultShortcut(newAction, QList<QKeySequence>() << shortcut.primary()); + KGlobalAccel::self()->setShortcut(newAction, QList<QKeySequence>() << shortcut.primary()); // Enable global shortcut. If that fails there is no sense in proceeding if (!KGlobalAccel::self()->hasShortcut(newAction)) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
