[gnome-python2-desktop/f17] fix build against metacity-2.34.2

[Daniel Drake]

commit 1e9c5e6ee2eddd60d7515b43c96c259a58a971c6
Author: Daniel Drake <dsd at laptop.org>
Date:   Tue Mar 13 14:59:23 2012 -0600

    fix build against metacity-2.34.2

 gnome-python-desktop-2.32.0-metacity-build.patch |   42 ++++++++++++++++++++++
 gnome-python2-desktop.spec                       |    9 ++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/gnome-python-desktop-2.32.0-metacity-build.patch b/gnome-python-desktop-2.32.0-metacity-build.patch
new file mode 100644
index 0000000..5054dd2
--- /dev/null
+++ b/gnome-python-desktop-2.32.0-metacity-build.patch
@@ -0,0 +1,42 @@
+From: Daniel Drake <dsd at laptop.org>
+
+Fix build against metacity-2.34.2. The port to GSettings
+removed these constants from the codebase.
+
+Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
+===================================================================
+--- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
++++ gnome-python-desktop-2.32.0/metacity/metacity.defs
+@@ -120,32 +120,6 @@
+   )
+ )
+ 
+-(define-enum FocusMode
+-  (in-module "Meta")
+-  (c-name "MetaFocusMode")
+-;   (gtype-id "META_TYPE_FOCUS_MODE")
+-  (values
+-    '("click" "META_FOCUS_MODE_CLICK")
+-    '("sloppy" "META_FOCUS_MODE_SLOPPY")
+-    '("mouse" "META_FOCUS_MODE_MOUSE")
+-  )
+-)
+-
+-(define-enum ActionTitlebar
+-  (in-module "Meta")
+-  (c-name "MetaActionTitlebar")
+-;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
+-  (values
+-    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
+-    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
+-    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
+-    '("none" "META_ACTION_TITLEBAR_NONE")
+-    '("lower" "META_ACTION_TITLEBAR_LOWER")
+-    '("menu" "META_ACTION_TITLEBAR_MENU")
+-    '("last" "META_ACTION_TITLEBAR_LAST")
+-  )
+-)
+-
+ (define-enum FrameType
+   (in-module "Meta")
+   (c-name "MetaFrameType")
diff --git a/gnome-python2-desktop.spec b/gnome-python2-desktop.spec
index 81d799d..874c590 100644
--- a/gnome-python2-desktop.spec
+++ b/gnome-python2-desktop.spec
@@ -28,7 +28,7 @@
 
 Name: gnome-python2-desktop
 Version: 2.32.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2+
 Group: Development/Languages
 Summary: The sources for additional PyGNOME Python extension modules
@@ -38,6 +38,9 @@ Source: http://download.gnome.org/sources/gnome-python-desktop/2.32/gnome-python
 # https://bugzilla.gnome.org/show_bug.cgi?id=616306
 Patch0: gnome-python-desktop-2.30.0-wnck-flagsfix.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=672016
+Patch1: gnome-python-desktop-2.32.0-metacity-build.patch
+
 ### Dependencies ###
 
 Requires: gnome-python2-canvas >= %{gnome_python_version}
@@ -213,6 +216,7 @@ via Python.
 %prep
 %setup -q -n gnome-python-desktop-%{version}
 %patch0 -p1 -b .flags
+%patch1 -p1 -b .metacity-build
 
 %build
 # evince, brasero and mediaprofiles are disabled because these things have
@@ -300,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/gtk-2.0/gnomekeyring.so
 
 %changelog
+* Tue Mar 13 2012 Daniel Drake <dsd at laptop.org> - 2.32.0-9
+- Fix build against metacity-2.34.2
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild