diff --git a/.gitignore b/.gitignore index dfe5b1c..6ef2af3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ diffstat-1.50.tgz diffstat-1.51.tgz /diffstat-1.54.tgz /diffstat-1.55.tgz +/diffstat-1.56.tgz diff --git a/diffstat-1.56.tgz.asc b/diffstat-1.56.tgz.asc new file mode 100644 index 0000000..5739340 --- /dev/null +++ b/diffstat-1.56.tgz.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) +Comment: See http://invisible-island.net/public/public.html for info + +iEYEABECAAYFAlEZnXYACgkQcCNT4Pfkjtth4gCdECTHWMdti2ymoLpPz2euzwMb +uGcAoLd5n1QDUi17SIpGbTv1D1b+8WVn +=vtw5 +-----END PGP SIGNATURE----- diff --git a/diffstat-help.patch b/diffstat-help.patch deleted file mode 100644 index 67fbb7b..0000000 --- a/diffstat-help.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 8535adc..f4f6497 100644 --- a/diffstat.spec +++ b/diffstat.spec @@ -1,14 +1,13 @@ Summary: A utility which provides statistics based on the output of diff Name: diffstat -Version: 1.55 -Release: 4%{?dist} +Version: 1.56 +Release: 1%{?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 @@ -24,9 +23,6 @@ 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} @@ -49,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/* %changelog +* Wed Feb 13 2013 Tim Waugh - 1.56-1 +- 1.56 (bug #910255). + * Wed Sep 19 2012 Tim Waugh - 1.55-4 - Run 'make check'. diff --git a/sources b/sources index f4a1740..3b7272b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -630d5278f1cd874dc3cc68cff3fddecf diffstat-1.55.tgz +3841a3831122674865d41be39d27052f diffstat-1.56.tgz