Fix --help output and man page (bug #1079076).

Resolves: rhbz#1079076

diffutils-FILE....patch

@@ -0,0 +1,12 @@
+diff -up diffutils-3.3/src/diff.c.FILE... diffutils-3.3/src/diff.c
+--- diffutils-3.3/src/diff.c.FILE...	2014-03-27 09:12:05.333317315 +0000
++++ diffutils-3.3/src/diff.c	2014-03-27 09:13:08.274564402 +0000
+@@ -947,7 +947,7 @@ static char const * const option_help_ms
+   N_("    --help               display this help and exit"),
+   N_("-v, --version            output version information and exit"),
+   "",
+-  N_("FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE...' or 'FILE... DIR'."),
++  N_("FILES are 'FILE1 FILE2' or 'DIR1 DIR2' or 'DIR FILE' or 'FILE DIR'."),
+   N_("If --from-file or --to-file is given, there are no restrictions on FILE(s)."),
+   N_("If a FILE is '-', read standard input."),
+   N_("Exit status is 0 if inputs are the same, 1 if different, 2 if trouble."),

diffutils.spec

@@ -1,12 +1,13 @@
 Summary: A GNU collection of diff utilities
 Name: diffutils
 Version: 3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
 Patch1: diffutils-cmp-s-empty.patch
 Patch2: diffutils-mkdir_p.patch
+Patch3: diffutils-FILE....patch
 Patch4: diffutils-i18n.patch
 Patch5: diffutils-format-security.patch
 License: GPLv3+
@@ -38,6 +39,9 @@ Install diffutils if you need to compare text files.
 # Work around @mkdir_p@ build issue.
 %patch2 -p1 -b .mkdir_p
 
+# Fix --help output and man page (bug #1079076).
+%patch3 -p1 -b .FILE...
+
 %patch4 -p1 -b .i18n
 
 # Applied upstream gnulib patch to avoid -Wformat-security warning
@@ -80,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diffutils.info*gz
 
 %changelog
+* Thu Mar 27 2014 Tim Waugh <twaugh@redhat.com> 3.3-6
+- Fix --help output and man page (bug #1079076).
+
 * Wed Dec  4 2013 Tim Waugh <twaugh@redhat.com> 3.3-5
 - Applied upstream gnulib patch to avoid -Wformat-security warning
   (bug #1037038).