From 3dae6cf4f885c6457040c3c213d1dca5566b398a Mon Sep 17 00:00:00 2001
From: nonamedotc <nonamedotc@fedoraproject.org>
Date: Mar 02 2015 23:38:26 +0000
Subject: Add shortcuts patch


---

diff --git a/libxfce4ui-4.12.0-keyboard-shortcuts.patch b/libxfce4ui-4.12.0-keyboard-shortcuts.patch
index c17c6e2..dc0c3cc 100644
--- a/libxfce4ui-4.12.0-keyboard-shortcuts.patch
+++ b/libxfce4ui-4.12.0-keyboard-shortcuts.patch
@@ -1,81 +1,32 @@
---- libxfce4ui-4.12.0/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	1969-12-31 18:00:00.000000000 -0600
-+++ libxfce4ui-4.12.0/libxfce4kbd-private/xfce4-keyboard-shortcuts-orig.xml	2015-02-18 10:12:39.000000000 -0600
-@@ -0,0 +1,78 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<channel name="xfce4-keyboard-shortcuts" version="1.0">
-+  <property name="commands" type="empty">
-+    <property name="default" type="empty">
-+      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
-+      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed">
-+        <property name="startup-notify" type="bool" value="true"/>
-+      </property>
-+      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
-+        <property name="startup-notify" type="bool" value="true"/>
-+      </property>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
-+      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
-+      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
-+      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
-+      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
-+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-+    </property>
-+  </property>
-+  <property name="xfwm4" type="empty">
-+    <property name="default" type="empty">
-+      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
-+      <property name="Escape" type="string" value="cancel_key"/>
-+      <property name="Left" type="string" value="left_key"/>
-+      <property name="Right" type="string" value="right_key"/>
-+      <property name="Up" type="string" value="up_key"/>
-+      <property name="Down" type="string" value="down_key"/>
-+      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
-+      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
-+      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
-+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
-+      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
-+      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
-+      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
-+      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
-+      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
-+      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
-+      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
-+      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
-+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
-+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
-+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
-+      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
-+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
-+      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
-+      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
-+      <property name="&lt;Primary&gt;F1" type="string" value="workspace_1_key"/>
-+      <property name="&lt;Primary&gt;F2" type="string" value="workspace_2_key"/>
-+      <property name="&lt;Primary&gt;F3" type="string" value="workspace_3_key"/>
-+      <property name="&lt;Primary&gt;F4" type="string" value="workspace_4_key"/>
-+      <property name="&lt;Primary&gt;F5" type="string" value="workspace_5_key"/>
-+      <property name="&lt;Primary&gt;F6" type="string" value="workspace_6_key"/>
-+      <property name="&lt;Primary&gt;F7" type="string" value="workspace_7_key"/>
-+      <property name="&lt;Primary&gt;F8" type="string" value="workspace_8_key"/>
-+      <property name="&lt;Primary&gt;F9" type="string" value="workspace_9_key"/>
-+      <property name="&lt;Primary&gt;F10" type="string" value="workspace_10_key"/>
-+      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
-+      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
-+    </property>
-+  </property>
-+</channel>
+--- libxfce4kbd-private/xfce4-keyboard-shortcuts-orig.xml	2015-03-01 21:27:22.817590600 -0600
++++ libxfce4kbd-private/xfce4-keyboard-shortcuts.xml	2015-03-01 21:29:40.291807055 -0600
+@@ -11,12 +11,29 @@
+         <property name="startup-notify" type="bool" value="true"/>
+       </property>
+       <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xflock4"/>
++      <property name="&lt;Control&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
+       <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
+       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+       <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
+       <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
++      <property name="XF86LogOff" type="string" value="xfce4-session-logout"/>
++      <property name="&lt;Control&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
++      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
++      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
+       <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+       <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
++      <property name="XF86Calendar" type="string" value="orage"/>
++      <property name="XF86Memo" type="string" value="xfce4-notes"/>
++      <property name="XF86Terminal" type="string" value="xfce4-terminal"/>
++      <property name="XF86Explorer" type="string" value="Thunar"/>
++      <property name="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/>
++      <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/>
++      <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/>
++      <property name="XF86AudioMedia" type="string" value="pragha"/>
++      <property name="XF86AudioPlay" type="string" value="pragha --pause"/>
++      <property name="XF86AudioPrev" type="string" value="pragha --prev"/>
++      <property name="XF86AudioNext" type="string" value="pragha --next"/>
++      <property name="XF86Calculator" type="string" value="galculator"/>
+     </property>
+   </property>
+   <property name="xfwm4" type="empty">
diff --git a/libxfce4ui.spec b/libxfce4ui.spec
index 8093fdd..04829d6 100644
--- a/libxfce4ui.spec
+++ b/libxfce4ui.spec
@@ -4,7 +4,7 @@
 
 Name:		libxfce4ui
 Version:        4.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Commonly used Xfce widgets
 
 Group:          System Environment/Libraries
@@ -18,7 +18,7 @@ Source0:        http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-
 ## Downstream patches
 # add more keyboard shortcuts to make multimedia keyboards work out of the box
 # Terminal changed to xfce4-terminal in the patch
-## Patch10:        libxfce4ui-4.12.0-keyboard-shortcuts.patch
+Patch10:        libxfce4ui-4.12.0-keyboard-shortcuts.patch
 
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.24.0
 BuildRequires:  pkgconfig(gtk+-2.0) >= 2.20.0
@@ -73,7 +73,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-## %patch10 -p1 -b .shortcuts
+%patch10 
 
 %build
 %configure --enable-gtk-doc --enable-gtk3\
@@ -146,6 +146,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Mar 1 2015 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.12.0-2
+- Add shortcuts patch
+
 * Sat Feb 28 2015 Mukundan Ragavan <noamedotc@fedoraproject.org> - 4.12.0-1
 - Update to latest stable release 4.12.0
 - Remove upstreamed patches