[sharutils/f19] Append new-line to usage output

[Petr Pisar]

commit 80d5463b40c865f2dc5aecb26eb14fade7d125a2
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu Oct 17 11:58:25 2013 +0200

    Append new-line to usage output

 ...ls-4.13.3-Append-new-line-to-usage-output.patch |   54 ++++++++++++++++++++
 sharutils.spec                                     |    8 +++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --git a/sharutils-4.13.3-Append-new-line-to-usage-output.patch b/sharutils-4.13.3-Append-new-line-to-usage-output.patch
new file mode 100644
index 0000000..0f597e7
--- /dev/null
+++ b/sharutils-4.13.3-Append-new-line-to-usage-output.patch
@@ -0,0 +1,54 @@
+From 2db890dcdecb9440305ca043869986c7ad22740a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Thu, 17 Oct 2013 11:51:42 +0200
+Subject: [PATCH] Append new-line to usage output
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ src/shar-opts.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/shar-opts.c b/src/shar-opts.c
+index 1da4365..9cd4ebd 100644
+--- a/src/shar-opts.c
++++ b/src/shar-opts.c
+@@ -221,7 +221,7 @@ static char const shar_opt_strs[10449] =
+ /*  3500 */ "no\0"
+ /*  3503 */ "SHAR\0"
+ /*  3508 */ "shar (GNU sharutils) - create a shell archive - Ver. 4.13.3\n"
+-            "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]\n\0"
++            "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]\n"
+ /*  3637 */ "$HOME\0"
+ /*  3643 */ ".sharrc\0"
+ /*  3651 */ "bug-gnu-utils at gnu.org\0"
+@@ -339,9 +339,9 @@ static char const shar_opt_strs[10449] =
+             "Though this program supports 'uuencode'-d files, they are deprecated.  If\n"
+             "you are emailing files, please consider mime-encoded files.  If you do\n"
+             "'uuencode', base 64 is the preferred encoding method.\n\n"
+-            "please send bug reports to:  bug-gnu-utils at gnu.org\0"
++            "please send bug reports to:  bug-gnu-utils at gnu.org\n\0"
+ /* 10319 */ "shar (GNU sharutils) - create a shell archive - Ver. 4.13.3\n"
+-            "USAGE:  shar [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]";
++            "USAGE:  shar [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]\n";
+ 
+ /*
+  *  compression option description:
+@@ -2145,10 +2145,10 @@ arguments.\n\n\
+ Though this program supports 'uuencode'-d files, they are deprecated.  If\n\
+ you are emailing files, please consider mime-encoded files.  If you do\n\
+ 'uuencode', base 64 is the preferred encoding method.\n\n\
+-please send bug reports to:  bug-gnu-utils at gnu.org"));
++please send bug reports to:  bug-gnu-utils at gnu.org\n"));
+   /* short-usage */
+   puts(_("shar (GNU sharutils) - create a shell archive - Ver. 4.13.3\n\
+-USAGE:  shar [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]"));
++USAGE:  shar [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [file ...]\n"));
+   /* explain */
+   puts(_("If no 'file's are specified, the list of input files is read from a\n\
+ standard input.  Standard input must not be a terminal"));
+-- 
+1.8.3.1
+
diff --git a/sharutils.spec b/sharutils.spec
index 66fb383..0566e88 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -1,7 +1,7 @@
 Summary: The GNU shar utilities for packaging and unpackaging shell archives
 Name: sharutils
 Version: 4.13.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The main code:                GPLv3+
 # lib (gnulib):                 LGPLv3+
 # lib/sys_socket.in.h:          LGPLv2+
@@ -16,6 +16,8 @@ URL: http://www.gnu.org/software/%{name}/
 Patch0: %{name}-4.13.3-Allow-exactly-one-input-file-when-specifying-output-.patch
 # Bug #901895, in upstream 4.13.4pre2
 Patch1: %{name}-4.13.3-Do-not-open-and-dev-stdout.patch
+# Bug #1020206, fixed in upstream 4.13.4
+Patch2: %{name}-4.13.3-Append-new-line-to-usage-output.patch
 BuildRequires: gettext
 Requires(post): info
 Requires(preun): info
@@ -39,6 +41,7 @@ shar files.
 %setup -q
 %patch0 -p1 -b .input_count
 %patch1 -p1 -b .dev_stdout
+%patch2 -p1 -b .usage_newline
 
 # convert TODO, THANKS to UTF-8
 for i in TODO THANKS; do
@@ -77,6 +80,9 @@ fi
 %{_mandir}/man5/*
 
 %changelog
+* Thu Oct 17 2013 Petr Pisar <ppisar at redhat.com> - 4.13.3-5
+- Append new-line to usage output (bug #1020206)
+
 * Tue May 28 2013 Petr Pisar <ppisar at redhat.com> - 4.13.3-4
 - Correct license declaration (LGPLv3+ and (LGPLv3+ or BSD) and GFDL added)