rpms/compiz/devel scale-key.patch,NONE,1.1 compiz.spec,1.106,1.107

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24651

Modified Files:
	compiz.spec 
Added Files:
	scale-key.patch 
Log Message:
* Fri Oct 12 2007 Kristian Høgsberg <krh at redhat.com> - 0.6.0-2
- Disable scale corner initiate and install a GNOME key config entry.


scale-key.patch:

--- NEW FILE scale-key.patch ---
diff -up compiz-6b86f3/metadata/scale.xml.in.scale-key compiz-6b86f3/metadata/scale.xml.in
--- compiz-6b86f3/metadata/scale.xml.in.scale-key	2007-08-22 18:57:43.000000000 -0400
+++ compiz-6b86f3/metadata/scale.xml.in	2007-10-12 10:59:02.000000000 -0400
@@ -12,7 +12,6 @@
 		<allowed key="true" button="true" edge="true" edgednd="true"/>
 		<default>
 		    <key><Shift><Alt>Up</key>
-		    <edges top_right="true"/>
 		</default>
 	    </option>
 	    <option name="initiate_all" type="action">
diff -up compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in.scale-key compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in
--- compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in.scale-key	2007-10-12 11:18:03.000000000 -0400
+++ compiz-6b86f3/gtk/gnome/50-compiz-desktop-key.xml.in	2007-10-12 11:16:56.000000000 -0400
@@ -13,4 +13,6 @@
 
         <KeyListEntry name="/apps/compiz/general/allscreens/options/run_command_terminal_key"/>
 
+        <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
+
 </KeyListEntries>


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- compiz.spec	10 Oct 2007 20:20:32 -0000	1.106
+++ compiz.spec	12 Oct 2007 15:25:14 -0000	1.107
@@ -13,7 +13,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +52,7 @@
 Patch103: composite-cube-logo.patch
 Patch105: fedora-logo.patch
 Patch106: redhat-logo.patch
+Patch110: scale-key.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -117,6 +118,7 @@
 %else
 %patch106 -p1 -b .redhat-logo
 %endif
+%patch110 -p1 -b .scale-key
 
 
 %build
@@ -276,6 +278,9 @@
 
 
 %changelog
+* Fri Oct 12 2007 Kristian Høgsberg <krh at redhat.com> - 0.6.0-2
+- Disable scale corner initiate and install a GNOME key config entry.
+
 * Wed Oct 10 2007 Warren Togami <wtogami at redhat.com> - 0.6.0-1
 - 0.6.0 final
 - always-restack-windows-on-map