From 3f4a491f9addc0652836d9e7283e0a5ed42b83ab Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Fri, 6 Mar 2009 12:26:56 +0000
Subject: [PATCH] improve tar-1.14-loneZeroWarning.patch (#487315)

---
 tar-1.14-loneZeroWarning.patch | 10 ++++++----
 tar.spec                       |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tar-1.14-loneZeroWarning.patch b/tar-1.14-loneZeroWarning.patch
index 673d7eb..d8cdeab 100644
--- a/tar-1.14-loneZeroWarning.patch
+++ b/tar-1.14-loneZeroWarning.patch
@@ -1,6 +1,7 @@
---- tar-1.15.1/src/list.c.loneZeroWarning	2004-12-21 14:34:05.000000000 +0000
-+++ tar-1.15.1/src/list.c	2005-01-07 11:32:39.348691306 +0000
-@@ -140,6 +140,14 @@
+diff -ruNp tar-1.22.orig/src/list.c tar-1.22/src/list.c
+--- tar-1.22.orig/src/list.c	2008-10-30 12:10:04.000000000 +0100
++++ tar-1.22/src/list.c	2009-03-06 00:03:05.925105425 +0100
+@@ -136,6 +136,14 @@ read_and (void (*do_something) (void))
  
  	  if (!ignore_zeros_option)
  	    {
@@ -15,11 +16,12 @@
  	      char buf[UINTMAX_STRSIZE_BOUND];
  
  	      status = read_header (false);
-@@ -147,6 +155,7 @@
+@@ -143,6 +151,8 @@ read_and (void (*do_something) (void))
  		break;
  	      WARN ((0, 0, _("A lone zero block at %s"),
  		     STRINGIFY_BIGINT (current_block_ordinal (), buf)));
 +#endif
++	      status = read_header (false);
  	      break;
  	    }
  	  status = prev_status;
diff --git a/tar.spec b/tar.spec
index 9c5d119..33d4572 100644
--- a/tar.spec
+++ b/tar.spec
@@ -2,7 +2,7 @@ Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
 Version: 1.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -89,6 +89,9 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Fri Mar 06 2009 Kamil Dudka <kdudka@redhat.com> 2:1.22-2
+- improve tar-1.14-loneZeroWarning.patch (#487315)
+
 * Mon Mar 02 2009 Ondrej Vasik <ovasik@redhat.com> 2:1.22-1
 - New upstream release 1.22, removed applied patch