diff --git a/patchutils-args.patch b/patchutils-args.patch new file mode 100644 index 0000000..76e7f1f --- /dev/null +++ b/patchutils-args.patch @@ -0,0 +1,49 @@ +diff -U0 patchutils-0.3.3/ChangeLog.args patchutils-0.3.3/ChangeLog +--- patchutils-0.3.3/ChangeLog.args 2013-04-02 11:42:17.000000000 +0100 ++++ patchutils-0.3.3/ChangeLog 2013-04-11 12:46:59.396964337 +0100 +@@ -0,0 +1,5 @@ ++2013-04-11 Tim Waugh ++ ++ * src/filterdiff.c: Don't show grepdiff-specific options in ++ help output for filterdiff/lsdiff (bug #948973). ++ +diff -up patchutils-0.3.3/src/filterdiff.c.args patchutils-0.3.3/src/filterdiff.c +--- patchutils-0.3.3/src/filterdiff.c.args 2011-05-26 14:47:46.000000000 +0100 ++++ patchutils-0.3.3/src/filterdiff.c 2013-04-11 12:46:59.397964342 +0100 +@@ -2,7 +2,7 @@ + * filterdiff - extract (or exclude) a diff from a diff file + * lsdiff - show which files are modified by a patch + * grepdiff - show files modified by a patch containing a regexp +- * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011 Tim Waugh ++ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013 Tim Waugh + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -1068,7 +1068,7 @@ const char * syntax_str = + " remove all comments (non-diff lines) from output (filterdiff)\n" + " -z, --decompress\n" + " decompress .gz and .bz2 files\n" +-" -n, --line-number\n" ++" -n, --line-number (lsdiff, grepdiff)\n" + " show line numbers (lsdiff, grepdiff)\n" + " --number-files (lsdiff, grepdiff)\n" + " show file numbers, for use with filterdiff's --files option (lsdiff, grepdiff)\n" +@@ -1085,15 +1085,15 @@ const char * syntax_str = + " prefix pathnames in old files with PREFIX\n" + " --addnewprefix=PREFIX\n" + " prefix pathnames in new files with PREFIX\n" +-" -s, --status\n" ++" -s, --status (lsdiff)\n" + " show file additions and removals (lsdiff)\n" + " -v, --verbose\n" + " verbose output -- use more than once for extra verbosity\n" +-" -E, --extended-regexp\n" ++" -E, --extended-regexp (grepdiff)\n" + " use extended regexps, like egrep (grepdiff)\n" + " -E, --empty-files-as-absent (lsdiff)\n" + " treat empty files as absent (lsdiff)\n" +-" -f FILE, --file=FILE\n" ++" -f FILE, --file=FILE (grepdiff)\n" + " read regular expressions from FILE (grepdiff)\n" + " --filter run as 'filterdiff' (grepdiff, lsdiff)\n" + " --list run as 'lsdiff' (filterdiff, grepdiff)\n" diff --git a/patchutils.spec b/patchutils.spec index f807f63..49aa259 100644 --- a/patchutils.spec +++ b/patchutils.spec @@ -6,6 +6,7 @@ License: GPLv2+ Group: Applications/System URL: http://cyberelk.net/tim/patchutils/ Source0: http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.xz +Patch1: patchutils-args.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: interdiff <= 0.0.10 Provides: interdiff = 0.0.10 @@ -23,6 +24,9 @@ patches, and simply listing the files modified by a patch. %prep %setup -q +# Fixed help output (bug #948973). +%patch1 -p1 -b .args + %build touch doc/patchutils.xml %configure @@ -46,6 +50,7 @@ rm -rf %{buildroot} %changelog * Thu Apr 11 2013 Tim Waugh 0.3.3-2 +- Fixed help output (bug #948973). - Fixed changelog dates. * Tue Apr 2 2013 Tim Waugh 0.3.3-1