[libreoffice/f16] Resolves: rhbz#788045 swriter --help wouldn't display help
Caolán McNamara
caolanm at fedoraproject.org
Wed Feb 29 11:27:50 UTC 2012
commit b16c755ef590a21c974ad39ed4845dbf874e518a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 29 11:27:47 2012 +0000
Resolves: rhbz#788045 swriter --help wouldn't display help
...-the-request-for-command-line-help-to-oos.patch | 6 +++---
libreoffice.spec | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch b/0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch
index d9bc7d5..d44f71e 100644
--- a/0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch
+++ b/0001-Do-not-pass-the-request-for-command-line-help-to-oos.patch
@@ -18,8 +18,8 @@ index a97f68d..b23d452 100755
esac
+# do not pass the request for command line help to oosplash
-+if test "$#" -eq 1; then
-+ case "$1" in
++for arg in $@ ; do
++ case "$arg" in
+ -h | --h | --he | --hel | --help)
+ "$sd_prog/soffice.bin" --help
+ exit 0
@@ -31,7 +31,7 @@ index a97f68d..b23d452 100755
+ *)
+ ;;
+ esac
-+fi
++done
+
# oosplash does the rest: forcing pages in, javaldx etc. are
exec $VALGRINDCHECK "$sd_prog/oosplash.bin" "$@"
diff --git a/libreoffice.spec b/libreoffice.spec
index a1b333b..5b3922b 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: 6%{?dist}
+Release: 7%{?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
@@ -2435,6 +2435,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Feb 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-7
+- Resolves: rhbz#788045 swriter --help wouldn't display help
+
* Thu Feb 23 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-6
- ensure non broken xml help.tree files
- ensure gdb .py files have the same timstamps so that multilib
More information about the scm-commits
mailing list