From 6cc464fdd08b96c880ed2ad9ee25d16bc4135d5067bc2e1fbace74dfc9f719b3 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 4 Aug 2009 22:02:17 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=2

---
 mutter-clutter-1.0.patch | 41 ++++++++++++++++++++++++++++++++++++++++
 mutter.changes           |  5 +++++
 mutter.spec              |  5 ++++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 mutter-clutter-1.0.patch

diff --git a/mutter-clutter-1.0.patch b/mutter-clutter-1.0.patch
new file mode 100644
index 0000000..b9b928c
--- /dev/null
+++ b/mutter-clutter-1.0.patch
@@ -0,0 +1,41 @@
+Index: mutter-2.27.1/configure.in
+===================================================================
+--- mutter-2.27.1.orig/configure.in
++++ mutter-2.27.1/configure.in
+@@ -228,7 +228,7 @@ else
+ fi
+ 
+ CLUTTER_VERSION=0.9.3
+-CLUTTER_PACKAGE=clutter-0.9
++CLUTTER_PACKAGE=clutter-1.0
+ AC_SUBST(CLUTTER_PACKAGE)
+ if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+   MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
+Index: mutter-2.27.1/configure
+===================================================================
+--- mutter-2.27.1.orig/configure
++++ mutter-2.27.1/configure
+@@ -18893,7 +18893,7 @@ $as_echo "$as_me: error: no. Mutter requ
+ fi
+ 
+ CLUTTER_VERSION=0.9.3
+-CLUTTER_PACKAGE=clutter-0.9
++CLUTTER_PACKAGE=clutter-1.0
+ 
+ if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
+   MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
+Index: mutter-2.27.1/src/Makefile.am
+===================================================================
+--- mutter-2.27.1.orig/src/Makefile.am
++++ mutter-2.27.1/src/Makefile.am
+@@ -210,8 +210,8 @@ Meta-$(api_version).gir: $(G_IR_SCANNER)
+ 		--include=GObject-2.0			\
+ 		--include=Gdk-2.0			\
+ 		--include=Gtk-2.0			\
+-		--include=Clutter-0.9			\
+-		--pkg=clutter-0.9			\
++		--include=Clutter-1.0			\
++		--pkg=clutter-1.0			\
+ 		--pkg=gtk+-2.0				\
+ 		--include=xfixes-4.0			\
+ 		--program=$$pwd/mutter			\
diff --git a/mutter.changes b/mutter.changes
index 12a87e5..6b46687 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  3 12:04:51 CEST 2009 - vuntz@novell.com
+
+- Add mutter-clutter-1.0.patch to fix build with clutter 1.0.
+
 -------------------------------------------------------------------
 Tue Jul 21 21:12:15 CEST 2009 - vuntz@novell.com
 
diff --git a/mutter.spec b/mutter.spec
index 27cd130..d20bcf9 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -35,11 +35,13 @@ BuildRequires:  gnome-common
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.27.1
-Release:        1
+Release:        2
 Summary:        Window and compositing manager based on Clutter
 Source:         %{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM mutter-build-fix.patch vuntz@novell.com -- Taken from git
 Patch0:         mutter-build-fix.patch
+# PATCH-FIX-UPSTREAM mutter-clutter-1.0.patch vuntz@novell.com -- Requires clutter-1.0 instead of clutter-0.9
+Patch1:         mutter-clutter-1.0.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       zenity
@@ -68,6 +70,7 @@ to develop applications that require these.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh