[mutter/f20] revert the OSK fix (#710296) as it breaks something worse (#711618)

[Adam Williamson]

commit 80986b0a92220287db25307d2229f7548ef385ca
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Dec 23 12:47:40 2013 -0800

    revert the OSK fix (#710296) as it breaks something worse (#711618)

 mutter.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/mutter.spec b/mutter.spec
index 71f44d6..47a40dc 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,6 +1,6 @@
 Name:          mutter
 Version:       3.10.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -11,7 +11,9 @@ Source0:       http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}
 
 Patch1: 0001-xrandr-use-hotplug_mode_update-property.patch
 Patch2: 0001-MetaWindowGroup-fix-paint-volume.patch
-Patch3: 0001-display-Don-t-focus-the-no-focus-window-when-sending.patch
+# Disabled as it causes BGO #711618 - re-enable when we have a fix for
+# that signed off and backportable - adamw 2013/12
+#Patch3: 0001-display-Don-t-focus-the-no-focus-window-when-sending.patch
 
 BuildRequires: clutter-devel >= 1.13.5
 BuildRequires: pango-devel
@@ -71,7 +73,9 @@ utilities for testing Metacity/Mutter themes.
 
 %patch1 -p1 -b .hotplug-mode-update
 %patch2 -p1
-%patch3 -p1 
+# Disabled as it causes BGO #711618 - re-enable when we have a fix for
+# that signed off and backportable - adamw 2013/12
+#patch3 -p1 
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -135,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %exclude %{_datadir}/gtk-doc
 
 %changelog
+* Mon Dec 23 2013 Adam Williamson <awilliam at redhat.com> - 3.10.2-5
+- revert the OSK fix as it triggered another bug, BGO #711618
+
 * Tue Dec 10 2013 Matthias Clasen <mclasen at redhat.com> - 3.10.2-4
 - Include a fix for on-screen keyboards