[openoffice.org/f14/master] Resolves: rhbz#623800 gnome-shell/mutter focus problems

[Caolan McNamara]

commit 4f98e024659c81b3805818115219e67b870fc610
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 13 09:05:38 2010 +0100

    Resolves: rhbz#623800 gnome-shell/mutter focus problems

 openoffice.org-3.3.0.ooo113856.vcl.mutter.patch |   13 +++++++++++++
 openoffice.org.spec                             |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch b/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
new file mode 100644
index 0000000..3325aa8
--- /dev/null
+++ b/openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
@@ -0,0 +1,13 @@
+diff -r e08d3a985a67 vcl/unx/gtk/window/gtkframe.cxx
+--- a/vcl/unx/gtk/window/gtkframe.cxx	Fri Aug 06 13:25:47 2010 +0100
++++ b/vcl/unx/gtk/window/gtkframe.cxx	Fri Aug 13 08:58:07 2010 +0100
+@@ -1355,7 +1355,8 @@
+             // awesome.
+             bool bHack =
+                 getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Metacity") ||
+-                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("compiz")
++                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("compiz") ||
++                getDisplay()->getWMAdaptor()->getWindowManagerName().EqualsAscii("Mutter")
+                 ;
+             if( nUserTime == 0 && bHack )
+             {
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 737a56d..07c30bd 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -115,6 +115,7 @@ Patch36: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
 Patch37: openoffice.org-gccXXXXX.idlc.patch
 Patch38: openoffice.org-3.3.0.ooo106591.sal.tradcopy.patch
 Patch39: workspace.impress197.patch
+Patch40: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1642,6 +1643,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch37 -p1 -b .gccXXXXX.idlc.patch
 %patch38 -p0 -b .ooo106591.sal.tradcopy.patch
 %patch39 -p1 -b .workspace.impress197.patch
+%patch40 -p0 -b .ooo113856.vcl.mutter.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3817,6 +3819,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Aug 13 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-4.2
+- Resolves: rhbz#623800 gnome-shell/mutter focus problems
+
 * Thu Aug 12 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-4.1
 - drop integrated workspace.impress197.patch