From 26d66ab309b2d19a88f64950bf8a43f8d312b2ef Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mar 26 2012 15:37:55 +0000
Subject: do not call libreoffice with --nocrashreport


---

diff --git a/unoconv-nocrashreport.patch b/unoconv-nocrashreport.patch
new file mode 100644
index 0000000..f41aada
--- /dev/null
+++ b/unoconv-nocrashreport.patch
@@ -0,0 +1,32 @@
+Common subdirectories: unoconv-0.4.orig/docs and unoconv-0.4/docs
+Common subdirectories: unoconv-0.4.orig/tests and unoconv-0.4/tests
+diff -u unoconv-0.4.orig/unoconv unoconv-0.4/unoconv
+--- unoconv-0.4.orig/unoconv	2012-03-24 16:17:11.583352009 -0400
++++ unoconv-0.4/unoconv	2012-03-24 16:18:52.198649000 -0400
+@@ -511,7 +511,7 @@
+             ### Start our own OpenOffice instance
+             info(3, "Launching our own listener using %s." % oobin)
+             try:
+-                ooproc = subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection])
++                ooproc = subprocess.Popen([oobin, "-headless", "-invisible", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection])
+                 info(2, 'OpenOffice listener successfully started. (pid=%s)' % ooproc.pid)
+ 
+                 ### Try connection to it for op.timeout seconds (flakky OpenOffice)
+@@ -703,7 +703,7 @@
+     def __init__(self):
+         info(1, "Start listener on %s:%s" % (op.server, op.port))
+         try:
+-            subprocess.call([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection])
++            subprocess.call([oobin, "-headless", "-invisible", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection])
+         except Exception, e:
+             error("Launch of %s failed.\n%s" % (oobin, e))
+         else:
+@@ -733,7 +733,7 @@
+         ### If there is a GUI now attached to the instance, disable listener
+         if convertor.desktop.getCurrentFrame():
+             try:
+-                subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection])
++                subprocess.Popen([oobin, "-headless", "-invisible", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection])
+                 info(2, 'OpenOffice listener successfully disabled.')
+                 ooproc.wait()
+             except Exception, e:
diff --git a/unoconv.spec b/unoconv.spec
index c09674f..001869a 100644
--- a/unoconv.spec
+++ b/unoconv.spec
@@ -1,7 +1,7 @@
 Summary:   Tool to convert between any document format supported by LibreOffice
 Name:      unoconv
 Version:   0.4
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2
 Group:     System Environment/Base
 URL:       http://dag.wieers.com/home-made/unoconv/
@@ -10,6 +10,9 @@ Source:    http://dag.wieers.com/home-made/%{name}/%{name}-%{version}.tar.bz2
 Patch0:    unoconv-output-files.patch
 # Fix LD_LIBRARY_PATH handling. From upstream trunk
 Patch1:    unoconv-ld-path.patch
+# Fedora's libreoffice does not have --nocrashreport option
+# https://github.com/dagwieers/unoconv/issues/45
+Patch2:    unoconv-nocrashreport.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch
@@ -34,6 +37,7 @@ RTF, Docbook (.xml), and more.
 %setup -q
 %patch0 -p3 -b .o_flag
 %patch1 -p3 -b .ld_library_path
+%patch2 -p1 -b .nocrashreport
 
 %build
 
@@ -51,6 +55,8 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 
 %changelog
+* Mon Mar 26 2012 David Tardon <dtardon@redhat.com> - 0.4-6
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild