rpms/compiz/F-12 unknown-key.patch, NONE, 1.1 compiz.spec, 1.185, 1.186

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10830

Modified Files:
	compiz.spec 
Added Files:
	unknown-key.patch 
Log Message:
fix unknown keybindings


unknown-key.patch:
 50-compiz-desktop-key.xml.in |   10 +++++-----
 50-compiz-key.xml.in         |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE unknown-key.patch ---
diff -up compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in
--- compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in.unknown-key	2009-10-26 19:31:49.714797414 -0400
+++ compiz-0.8.2/gtk/gnome/50-compiz-desktop-key.xml.in	2009-10-26 19:32:47.250797450 -0400
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/main_menu_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/main_menu_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_screenshot_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
 
-	<KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
 
-        <KeyListEntry name="/apps/compiz/gnomecompat/allscreens/options/run_command_terminal_key"/>
+        <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
 
 </KeyListEntries>
diff -up compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in
--- compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in.unknown-key	2009-10-26 19:33:00.669802869 -0400
+++ compiz-0.8.2/gtk/gnome/50-compiz-key.xml.in	2009-10-26 19:47:07.630802031 -0400
@@ -15,9 +15,9 @@
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
 
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_decrease_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_decrease_key"/>
 
-	<KeyListEntry name="/apps/compiz/general/allscreens/options/opacity_increase_key"/>
+	<KeyListEntry name="/apps/compiz/plugins/obs/allscreens/options/opacity_increase_key"/>
 
 	<KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -p -r1.185 -r1.186
--- compiz.spec	26 Oct 2009 12:46:50 -0000	1.185
+++ compiz.spec	26 Oct 2009 23:55:49 -0000	1.186
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +69,8 @@ Patch125: compiz-0.8.2-gnome-terminal.pa
 #Fix build
 Patch126: compiz-0.8.2-gconf-buildfix.patch
 
+Patch127: unknown-key.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -137,6 +139,7 @@ and other kde integration related stuff.
 %patch123 -p1 -b .initial-plugins
 %patch125 -p1 -b .gnome-terminal
 %patch126 -p1 -b .gconf
+%patch127 -p1 -b .unknown-key
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -315,6 +318,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 0.8.2-18
+- Better fix for keybindings
+
 * Mon Oct 26 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-17
 - Fix was wrong - revert it