- Rebase to latest upstream changes which has the rest of the bindings

rewrite. Add resize-move-keybindings.patch to make move and resize
    bindings work like metacity.
- Add back scale plugin.

.cvsignore

@@ -1,3 +1 @@
-compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-desktop-effects-0.6.tar.gz
-desktop-effects-0.6.1.tar.gz
+compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2

aiglx-defaults.patch

@@ -9,10 +9,10 @@ work with AIGLX.
  1 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/src/main.c b/src/main.c
-index cf0a5d7..fd7afc3 100644
+index 3d3a9c5..bbafd2b 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -72,8 +72,8 @@ CompWindow *lastFoundWindow = 0;
+@@ -78,8 +78,8 @@ CompWindow *lastFoundWindow = 0;
  CompWindow *lastDamagedWindow = 0;
  
  Bool replaceCurrentWm = FALSE;
@@ -23,7 +23,7 @@ index cf0a5d7..fd7afc3 100644
  
  static void
  usage (void)
-@@ -84,8 +84,10 @@ usage (void)
+@@ -90,8 +90,10 @@ usage (void)
  	    "[--refresh-rate RATE]\n       "
  	    "[--fast-filter] "
  	    "[--indirect-rendering] "
@@ -35,7 +35,7 @@ index cf0a5d7..fd7afc3 100644
  	    "[--replace] "
  	    "[--sm-disable] "
  	    "[--sm-client-id ID] "
-@@ -176,10 +178,18 @@ main (int argc, char **argv)
+@@ -182,10 +184,18 @@ main (int argc, char **argv)
  	{
  	    indirectRendering = TRUE;
  	}

compiz.spec

@@ -1,7 +1,7 @@
 #						-*- mode: rpm-spec -*-
 
-%define		sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
-%define		snapshot 20060721
+%define		sha1 3173a142efe5e7af83ebb534a074d9d2a0c67a86
+%define		snapshot 20060817
 
 %define		dialogversion	0.6.1
 
@@ -10,7 +10,7 @@ Url:            http://www.freedesktop.org/Software/compiz
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.15.%{snapshot}git.fc5.aiglx
+Release:        0.16.%{snapshot}git%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +42,7 @@ Patch104: fbconfig-depth-fix.patch
 Patch105: fedora-logo.patch
 Patch106: glfinish.patch
 Patch107: desktop-effects-0.6.1-delete-session.patch
-
+Patch108: resize-move-keybindings.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -81,6 +81,8 @@ pushd ../desktop-effects-%{dialogversion} >& /dev/null
 %patch107 -p1 -b .delete-session
 popd
 
+%patch108 -p1 -b .resize-move-keybindings
+
 %build
 %configure --disable-libsvg-cairo
 
@@ -141,6 +143,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/compiz
 
 %changelog
+* Thu Aug 17 2006 Kristian Høgsberg <krh@redhat.com> - 0.0.13-0.16.20060817git.fc6
+- Rebase to latest upstream changes which has the rest of the bindings
+  rewrite.  Add resize-move-keybindings.patch to make move and resize
+  bindings work like metacity.
+- Add back scale plugin.
+
 * Thu Aug 10 2006 Ray Strode <rstrode@redhat.com> 0.0.13-0.15.20060721git.fc5.aiglx
 - Add Requires: gnome-session 2.15.90-2.fc6 (bug 201473)
 - unlink session file on changing wms (bug 201473)

composite-cube-logo.patch

@@ -9,10 +9,10 @@ From: Kristian Høgsberg <krh@redhat.com>
  1 files changed, 17 insertions(+), 0 deletions(-)
 
 diff --git a/plugins/cube.c b/plugins/cube.c
-index b222685..0576b8d 100644
+index 31edd5c..339d843 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
-@@ -1204,11 +1204,28 @@ cubePaintTransformedScreen (CompScreen		
+@@ -1162,11 +1162,28 @@ cubePaintTransformedScreen (CompScreen		
  
  	if (cs->invert == 1 && s->size == 4 && cs->texture.name)
  	{

fedora-logo.patch

@@ -5,34 +5,11 @@ From: Kristian Høgsberg <krh@redhat.com>
 
 ---
 
- plugins/compiz.schemas.in.in |    4 ++--
- plugins/cube.c               |    8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ plugins/cube.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/plugins/compiz.schemas.in.in b/plugins/compiz.schemas.in.in
-index 899622d..dddbfcd 100644
---- a/plugins/compiz.schemas.in.in
-+++ b/plugins/compiz.schemas.in.in
-@@ -913,7 +913,7 @@
-             <applyto>/apps/compiz/plugins/cube/screen0/options/color</applyto>
-             <owner>compiz</owner>
-             <type>string</type>
--            <default>#efebe7ff</default>
-+            <default>#00194aff</default>
-             <locale name="C">
-                 <short>Cube Color</short>
-                 <long>
-@@ -956,7 +956,7 @@
-             <owner>compiz</owner>
-             <type>list</type>
-             <list_type>string</list_type>
--            <default>[novell.png]</default>
-+            <default>[/usr/share/pixmaps/fedora-logo.png]</default>
-             <locale name="C">
-                 <short>Image files</short>
-                 <long>
 diff --git a/plugins/cube.c b/plugins/cube.c
-index 0576b8d..e9e8299 100644
+index 339d843..783b408 100644
 --- a/plugins/cube.c
 +++ b/plugins/cube.c
 @@ -44,14 +44,14 @@ #include <X11/Xproto.h>

sources

@@ -1,3 +1 @@
-16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-101df08c0adb11640e512db33165acf4  desktop-effects-0.6.tar.gz
-85c612c6ad47e31c70f0ba85063882e4  desktop-effects-0.6.1.tar.gz
+ec5b51f98b914af4d51ad53bc832b7e1  compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2

tfp-server-extension.patch

@@ -9,7 +9,7 @@ too.
  1 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/screen.c b/src/screen.c
-index b9be10b..14e7083 100644
+index 0941107..9ec30d5 100644
 --- a/src/screen.c
 +++ b/src/screen.c
 @@ -897,7 +897,7 @@ addScreen (CompDisplay *display,