[libreoffice/f16] fix the fix for rhbz#800272

[Michael Stahl]

commit 7f6e808feb4cbb4c10a6ef85d5dc5a6eeff43879
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 8 16:13:19 2012 +0100

    fix the fix for rhbz#800272

 ...not-complain-about-soffice-command-line-o.patch |   41 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/0001-desktop-do-not-complain-about-soffice-command-line-o.patch b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch
new file mode 100644
index 0000000..1832a34
--- /dev/null
+++ b/0001-desktop-do-not-complain-about-soffice-command-line-o.patch
@@ -0,0 +1,41 @@
+From db21197de4383f75718190072171adab15e64a00 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Thu, 8 Mar 2012 15:49:52 +0100
+Subject: [PATCH] desktop: do not complain about soffice command line options:
+
+These are handled in the soffice wrapper script, but that is too stupid
+to be able to filter these out, so just ignore them in soffice.bin.
+
+(regression from 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1)
+
+Also, print errors on stderr.
+---
+ desktop/source/app/cmdlineargs.cxx |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
+index 5ae86ab..0bc6312 100644
+--- a/desktop/source/app/cmdlineargs.cxx
++++ b/desktop/source/app/cmdlineargs.cxx
+@@ -306,10 +306,16 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
+                     }
+ #if defined UNX
+                     else
++                    // because it's impossible to filter these options that
++                    // are handled in the soffice shell script with the
++                    // primitive tools that /bin/sh offers, ignore them here
++                    if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) &&
++                        !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) &&
++                        !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind")))
+                     {
+-                        printf("Unknown option %s\n",
++                        fprintf(stderr, "Unknown option %s\n",
+                             rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr());
+-                        printf("Run 'soffice --help' to see a full list of available command line options.\n");
++                        fprintf(stderr, "Run 'soffice --help' to see a full list of available command line options.\n");
+                         SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True );
+                     }
+ #endif
+-- 
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index b846995..60bc46e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -33,7 +33,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -240,6 +240,7 @@ Patch118: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
 Patch119: 0001-Disable-problematic-reading-of-external-entities-in-.patch
 Patch120: 0001-Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch
 Patch121: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
+Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1158,6 +1159,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch119 -p1 -b .Disable-problematic-reading-of-external-entities-in-.patch
 %patch120 -p1 -b .Splash-screen-fix-for-multi-head-on-Linux-fdo-33214.patch
 %patch121 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
+%patch122 -p1 -b .desktop-do-not-complain-about-soffice-command-line-o.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2477,6 +2479,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Mar 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-9.UNBUILT
+
 * Tue Mar 06 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8
 - Resolves: fdo#31966 do not create an empty slide when printing handouts
 - fixes nsplugin