From 953ef5bc750fd37a4f2e040f7b9145520d4077e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@fedoraproject.org>
Date: Tue, 14 Aug 2007 18:34:19 +0000
Subject: [PATCH] - Build git snapshot from fedora branch at    
 git://people.freedesktop.org/~krh/compiz, brances from 0.6 upstream    
 branch. - Fixes #237486.

---
 .cvsignore  |  4 ++--
 compiz.spec | 36 ++++++++++++++++++++++--------------
 sources     |  4 ++--
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index bc85a3e..b2cf3c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-desktop-effects-0.7.3.tar.bz2
-compiz-0.5.2.tar.gz
+desktop-effects-0.7.4.tar.bz2
+compiz-0ec3ec.tar.gz
diff --git a/compiz.spec b/compiz.spec
index 3d1c3c2..a71e3f2 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -1,12 +1,13 @@
-%define		dialogversion	0.7.3
-%define		plugins place,png,decoration,clone,fade,minimize,move,resize,switcher,scale
+%define		snapshot	0ec3ec
+%define		dialogversion	0.7.4
+%define		plugins		place,png,decoration,clone,fade,minimize,move,resize,switcher,scale
 
 Name:           compiz
 Url:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.5.2
-Release:        3%{?dist}
+Release:        3.%{snapshot}%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +40,7 @@ BuildRequires:  librsvg2-devel
 BuildRequires:  metacity-devel >= 2.18
 BuildRequires:  mesa-libGLU-devel
 
-Source0:        http://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{snapshot}.tar.gz
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 
 # Patches that are not upstream
@@ -73,7 +74,7 @@ windows and compositing manager.
 
 %prep
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
-%setup -q 
+%setup -q  -n compiz-%{snapshot}
 
 # %patch103 -p1 -b .composite-cube-logo
 %patch105 -p1 -b .fedora-logo
@@ -85,15 +86,16 @@ rm -rf $RPM_BUILD_ROOT
 CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
 export CPPFLAGS
 
-%configure 			\
-	--enable-gconf 		\
-	--enable-dbus 		\
-	--enable-place 		\
-	--enable-librsvg 	\
-	--enable-gtk 		\
-	--enable-metacity 	\
-	--enable-gnome		\
-	--with-default-plugins=%{plugins} \
+%configure 					\
+	--enable-gconf 				\
+	--enable-dbus 				\
+	--enable-place 				\
+	--enable-librsvg 			\
+	--enable-gtk 				\
+	--enable-metacity 			\
+	--enable-gnome				\
+	--with-default-plugins=%{plugins}	\
+	--enable-gnome-keybindings		\
 	--disable-kde
 
 make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
@@ -197,6 +199,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libdecoration.so
 
 %changelog
+* Tue Aug 14 2007 Kristian Høgsberg <krh@redhat.com> - 0.5.2-3.0ec3ec
+- Build git snapshot from fedora branch at
+  git://people.freedesktop.org/~krh/compiz, brances from 0.6 upstream
+  branch.
+- Fixes #237486.
+
 * Fri Aug 10 2007 Kristian Høgsberg <krh@redhat.com> - 0.5.2-3
 - Require desktop-effects 0.7.3 and gnome-session 2.19.6-5 which pass
   'glib' on the command line too.
diff --git a/sources b/sources
index ced5908..e04178e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2420574cc45bd5924cf0235905e9c09f  desktop-effects-0.7.3.tar.bz2
-7a38a921359573fb57d53e057f481f08  compiz-0.5.2.tar.gz
+4808733d3c3076570b29676534cd1d4c  desktop-effects-0.7.4.tar.bz2
+cfcf5f3d4a3f8dc4363f570ea326a7e3  compiz-0ec3ec.tar.gz