[openoffice.org/f14/master] Related: rhbz#610103 make this even more robust

[Caolan McNamara]

commit 75a8a8abb49928fe27e791263cca761eb3937543
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 27 12:19:29 2011 +0000

    Related: rhbz#610103 make this even more robust

 ...z-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch |   45 ++++++++++++++++++++
 openoffice.org.spec                                |   13 ++++--
 2 files changed, 54 insertions(+), 4 deletions(-)
---
diff --git a/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch b/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
new file mode 100644
index 0000000..3c2b128
--- /dev/null
+++ b/0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
@@ -0,0 +1,45 @@
+From f167cafd5edfcac674a556fa2f813ce0dec34303 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 27 Jan 2011 12:14:17 +0000
+Subject: [PATCH] Related: rhbz#610103 more woes on rpm upgrade vs rpm erase
+
+---
+ sfx2/source/appl/shutdowniconunx.cxx |   18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
+index 5618e73..cfbf974 100644
+--- a/sfx2/source/appl/shutdowniconunx.cxx
++++ b/sfx2/source/appl/shutdowniconunx.cxx
+@@ -333,13 +333,25 @@ static gboolean display_menu_cb( GtkWidget *,
+  * upgraded, then the old quickstarter is still running, but is now unreliable
+  * as the old install has been deleted. A fairly intractable problem but we
+  * can avoid much of the pain if we turn off the quickstarter if we detect
+- * that it has been physically deleted.
++ * that it has been physically deleted or overwritten
+ */
+ static void notify_file_changed(GFileMonitor * /*gfilemonitor*/, GFile * /*arg1*/,
+     GFile * /*arg2*/, GFileMonitorEvent event_type, gpointer /*user_data*/)
+ {
+-    if (event_type == G_FILE_MONITOR_EVENT_DELETED)
+-        exit_quickstarter_cb(NULL);
++    //Shutdown the quick starter if anything has happened to make it unsafe
++    //to remain running, e.g. rpm --erased and all libs deleted, or
++    //rpm --upgrade and libs being overwritten
++    switch (event_type)
++    {
++        case G_FILE_MONITOR_EVENT_DELETED:
++        case G_FILE_MONITOR_EVENT_CREATED:
++        case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
++        case G_FILE_MONITOR_EVENT_UNMOUNTED:
++            exit_quickstarter_cb(GTK_WIDGET(pTrayIcon));
++            break;
++        default:
++            break;
++    }
+ }
+ #endif
+ 
+-- 
+1.7.3.5
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 600da3f..78fbdfe 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 20
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -157,6 +157,7 @@ Patch73: 0001-Resolves-rhbz-666088-clean-up-search-cache-singleton.patch
 Patch74: 0001-rhbz-659394-avoid-mangling-internal-state-in-case-of.patch
 Patch75: openoffice.org-3.3.0.rh668349.backportstatusicon.patch
 Patch76: libreoffice-fdo31271.icu.patch
+Patch77: 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1725,11 +1726,12 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch69 -p1 -b .rhbz663857-font-color-missing-C-FAQ-10.3-do.patch
 %patch70 -p1 -b .workspace.jl155.patch
 %patch71 -p1 -b .Avoid-double-paste-when-pasting-text-into-cell-comme.patch
-%patch72 -p1 -b .rhbz-660342-Undo-Redo-crash-with-postits.patch
-%patch73 -p1 -b .rhbz-666088-clean-up-search-cache-singleton.patch
-%patch74 -p1 -b .rhbz-659394-avoid-mangling-internal-state-in-case-of.patch
+%patch72 -p1 -b .rhbz660342-Undo-Redo-crash-with-postits.patch
+%patch73 -p1 -b .rhbz666088-clean-up-search-cache-singleton.patch
+%patch74 -p1 -b .rhbz659394-avoid-mangling-internal-state-in-case-of.patch
 %patch75 -p0 -b .rh668349.backportstatusicon.patch
 %patch76 -p1 -b .libreoffice-fdo31271.icu.patch
+%patch77 -p1 -b .rhbz610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3925,6 +3927,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Thu Jan 27 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
+- Related: rhbz#610103 make this even more robust
+
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )