diff --git a/marco.spec b/marco.spec index 42c0bf9..d115ba0 100644 --- a/marco.spec +++ b/marco.spec @@ -14,7 +14,7 @@ Name: marco Version: %{branch}.0 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 0.5%{?git_rel}%{?dist} Summary: MATE Desktop window manager License: LGPLv2+ and GPLv2+ @@ -35,6 +35,16 @@ Source5: window.png # needed for fixing initial-setup issue, rhbz (#962009) Patch0: marco_add-pixbuf-inline-icons_1.9.x.patch +# https://github.com/mate-desktop/marco/pull/187 +Patch1: marco_1.10-workspaces-keybindings.patch +Patch2: marco_1.10-windows-keybindings.patch +# https://github.com/mate-desktop/marco/pull/160 +Patch3: marco_add-tile-keybinds-1.patch +Patch4: marco_add-tile-keybinds-2.patch +Patch5: marco_add-tile-keybinds-3.patch +Patch6: marco_add-tile-keybinds-4.patch +# https://github.com/mate-desktop/marco/pull/164 +Patch7: marco_tile-preview-invalidate-window-before-showing.patch Requires: mate-desktop-libs @@ -90,6 +100,13 @@ cp %{SOURCE4} src/stock_minimize.png cp %{SOURCE5} src/window.png %patch0 -p1 -b .inline-icons +%patch1 -p1 -b .workspaces-keybindings +%patch2 -p1 -b .windows-keybindings +%patch3 -p1 -b .tile-keybinds-1 +%patch4 -p1 -b .tile-keybinds-2 +%patch5 -p1 -b .tile-keybinds-3 +%patch6 -p1 -b .tile-keybinds-4 +%patch7 -p1 -b .tile-preview # needed for the patch and for git snapshot builds autoreconf -if @@ -169,6 +186,12 @@ fi %changelog +* Wed Apr 22 2015 Wolfgang Ulbrich - 1.10.0-2 +- fix workspaces keybindings +- fix windows keybindings +- add keybindings for tiling +- fix tile-preview + * Mon Apr 06 2015 Wolfgang Ulbrich - 1.10.0-1 - update to 1.10.0 release