From ca568217306e0ff04782e07c884ae70609a321e4 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Apr 20 2015 19:50:18 +0000
Subject: 0.3.4.


---

diff --git a/.gitignore b/.gitignore
index 1c010bf..903095b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ patchutils-0.3.0.tar.bz2
 patchutils-0.3.1.tar.bz2
 /patchutils-0.3.2.tar.bz2
 /patchutils-0.3.3.tar.xz
+/patchutils-0.3.4.tar.xz
diff --git a/patchutils-0.3.3.tar.xz.sig b/patchutils-0.3.3.tar.xz.sig
deleted file mode 100644
index 25e1101..0000000
Binary files a/patchutils-0.3.3.tar.xz.sig and /dev/null differ
diff --git a/patchutils-0.3.4.tar.xz.sig b/patchutils-0.3.4.tar.xz.sig
new file mode 100644
index 0000000..d4bb940
Binary files /dev/null and b/patchutils-0.3.4.tar.xz.sig differ
diff --git a/patchutils-args.patch b/patchutils-args.patch
deleted file mode 100644
index 76e7f1f..0000000
--- a/patchutils-args.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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  <twaugh@redhat.com>
-+
-+	* 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 <twaugh@redhat.com>
-+ * Copyright (C) 2001, 2002, 2003, 2004, 2008, 2009, 2011, 2013 Tim Waugh <twaugh@redhat.com>
-  *
-  * 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 d0aa332..d4bfa6e 100644
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -1,12 +1,11 @@
 Summary: A collection of programs for manipulating patch files
 Name: patchutils
-Version: 0.3.3
-Release: 6%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 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
@@ -24,9 +23,6 @@ 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
@@ -49,6 +45,9 @@ rm -rf %{buildroot}
 %{_mandir}/*/*
 
 %changelog
+* Mon Apr 20 2015 Tim Waugh <twaugh@redhat.com> - 0.3.4-1
+- 0.3.4.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 5dac3ca..dec33cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b640b6b8af6183f83eacf7bd6d2460cb  patchutils-0.3.3.tar.xz
+ee95b5993d07ccdf27ca9f2cc4e6ffee  patchutils-0.3.4.tar.xz