From 3fbb33805d26f333fdd30fd8d810f3c7da3b64ef Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 29 2012 16:31:16 +0000
Subject: Make the --help output consistent with the man page (bug #852770).


Resolves: rhbz#852770

---

diff --git a/diffstat-help.patch b/diffstat-help.patch
new file mode 100644
index 0000000..67fbb7b
--- /dev/null
+++ b/diffstat-help.patch
@@ -0,0 +1,21 @@
+diff -up diffstat-1.55/diffstat.c.help diffstat-1.55/diffstat.c
+--- diffstat-1.55/diffstat.c.help	2012-08-29 17:23:50.647274864 +0100
++++ diffstat-1.55/diffstat.c	2012-08-29 17:26:38.089877925 +0100
+@@ -2190,7 +2190,9 @@ usage(FILE *fp)
+ 	"If no filename is given on the command line, reads from standard input.",
+ 	"",
+ 	"Options:",
++	"  -b      ignore lines matching \"Binary files XXX and YYY differ\"",
+ 	"  -c      prefix each line with comment (#)",
++	"  -C      add SGR color escape sequences to highlight the histogram",
+ #if OPT_TRACE
+ 	"  -d      debug - prints a lot of information",
+ #endif
+@@ -2208,6 +2210,7 @@ usage(FILE *fp)
+ 	"  -q      suppress the \"0 files changed\" message for empty diffs",
+ 	"  -r NUM  specify rounding for histogram (0=none, 1=simple, 2=adjusted)",
+ 	"  -R      assume patch was created with old and new files swapped",
++	"  -s      show only the summary line",
+ 	"  -S PATH specify location of original files, use for unchanged-count",
+ 	"  -t      print a table (comma-separated-values) rather than histogram",
+ 	"  -u      do not sort the input list",
diff --git a/diffstat.spec b/diffstat.spec
index b1e952b..1a220e4 100644
--- a/diffstat.spec
+++ b/diffstat.spec
@@ -1,13 +1,14 @@
 Summary: A utility which provides statistics based on the output of diff
 Name: diffstat
 Version: 1.55
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://invisible-island.net/diffstat
 Source0: ftp://invisible-island.net/diffstat/%{name}-%{version}.tgz
 # Taken from diffstat.c.
 Source1: COPYING
+Patch1: diffstat-help.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: xz
 
@@ -23,6 +24,9 @@ diff command's output.
 %prep
 %setup -q
 
+# Make the --help output consistent with the man page (bug #852770).
+%patch1 -p1 -b .help
+
 %build
 %configure
 make %{?_smp_mflags}
@@ -42,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Aug 29 2012 Tim Waugh <twaugh@redhat.com> - 1.55-3
+- Make the --help output consistent with the man page (bug #852770).
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.55-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild