From 4d8151edebf8ec82abb73bd833d74bd218f3cb1b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 8 Nov 2016 11:55:16 +0100
Subject: [PATCH] allow abrt to work again

---
 0001-don-t-suppress-crashes.patch | 35 +++++++++++++++++++++++++++++++
 libreoffice.spec                  |  8 ++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 0001-don-t-suppress-crashes.patch

diff --git a/0001-don-t-suppress-crashes.patch b/0001-don-t-suppress-crashes.patch
new file mode 100644
index 0000000..fcd1f1d
--- /dev/null
+++ b/0001-don-t-suppress-crashes.patch
@@ -0,0 +1,35 @@
+From a0e6d2abeed9d64fe7862a7664ba80a6178bf3f2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 8 Nov 2016 11:50:06 +0100
+Subject: [PATCH] don't suppress crashes
+
+An automatic restart after a crash makes the crash invisible to abrt.
+
+Change-Id: I3854e619356049b144b08575879d289a3c12e4c9
+---
+ desktop/source/app/app.cxx | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
+index 53365f4..3a3bac8 100644
+--- a/desktop/source/app/app.cxx
++++ b/desktop/source/app/app.cxx
+@@ -1312,14 +1312,12 @@ void Desktop::Exception(ExceptionCategory nCategory)
+             if( bRestart )
+             {
+                 RequestHandler::Disable();
+-                if( pSignalHandler )
+-                    osl_removeSignalHandler( pSignalHandler );
+ 
+                 restartOnMac(false);
+                 if ( m_rSplashScreen.is() )
+                     m_rSplashScreen->reset();
+ 
+-                _exit( EXITHELPER_CRASH_WITH_RESTART );
++                return;
+             }
+             else
+             {
+-- 
+2.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 191e44b..38cadb8 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -55,7 +55,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.0
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -235,6 +235,9 @@ Patch5: 0001-add-X-TryExec-entries-to-desktop-files.patch
 Patch6: 0001-rhbz-1353069-don-t-record-undo-information-in-the-cl.patch
 Patch7: 0001-convert-angle-from-degrees-to-radians-for-glm.patch
 Patch8: 0001-remove-OpenGL-transitions-config.-file-from-scheme.patch
+# not upstreamed: upstream wants an automatic restart after a crash; we
+# want a nice abrt report
+Patch9: 0001-don-t-suppress-crashes.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2290,6 +2293,9 @@ done
 %endif
 
 %changelog
+* Tue Nov 08 2016 David Tardon <dtardon@redhat.com> - 1:5.3.0.0-2.alpha1
+- allow abrt to work again
+
 * Sat Oct 22 2016 David Tardon <dtardon@redhat.com> - 1:5.3.0.0-1.alpha1
 - update to 5.3.0 alpha1