From d0db67ad94e3da7892cf1a56e99d831d8ae4a477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 9 Jul 2012 12:54:28 +0100 Subject: [PATCH] Resolves: rhbz#838368 --view ignored while -view accepted --- ...8368-view-ignored-while-view-accepte.patch | 37 +++++++++++++++++++ libreoffice.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch diff --git a/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch b/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch new file mode 100644 index 0000000..d434c9b --- /dev/null +++ b/0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch @@ -0,0 +1,37 @@ +From 4fc8af89257436b9cad70de574a166aa11ec42f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 9 Jul 2012 12:51:16 +0100 +Subject: [PATCH] Resolves: rhbz#838368 --view ignored while -view accepted + +and our ooviewdoc script uses --view + +Change-Id: Ice708f1c72c8d29d411ba21e93cb19876af13881 +--- + desktop/source/app/cmdlineargs.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx +index af7ee26..c67db8c 100644 +--- a/desktop/source/app/cmdlineargs.cxx ++++ b/desktop/source/app/cmdlineargs.cxx +@@ -217,7 +217,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + bStartEvent = false; + bDisplaySpec = false; + } +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-view" ))) ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" ))) + { + // open in viewmode + bOpenEvent = false; +@@ -229,7 +229,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) + bStartEvent = false; + bDisplaySpec = false; + } +- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-show" ))) ++ else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" ))) + { + // open in viewmode + bOpenEvent = false; +-- +1.7.10.4 + diff --git a/libreoffice.spec b/libreoffice.spec index 0693ffe..c136c55 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -30,7 +30,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.0 -Release: 3%{libo_prerelease}%{?dist} +Release: 4%{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 Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -161,6 +161,7 @@ Patch5: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch Patch6: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch Patch7: libreoffice-installfix.patch Patch8: 0001-specify-the-sourced-file-with-path.patch +Patch9: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -766,6 +767,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch6 -p1 -b .ooo105784.vcl.sniffscriptforsubs.patch %patch7 -p1 -b .libreoffice-installfix.patch %patch8 -p1 -b .specify-the-sourced-file-with-path.patch +%patch9 -p1 -b .rhbz838368-view-ignored-while-view-accepte.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2000,6 +2002,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Jul 09 2012 Caolán McNamara - 3.6.0.0-4 +- Resolves: rhbz#838368 --view ignored while -view accepted + * Wed Jul 05 2012 David Tardon - 3.6.0.0-3 - 3.6.0 beta3