[tar/f15] rebase to bugfix-only release 1.26 - fixes regression in --verify / -W option (#723726)

[Ondrej Vasik]

commit a751692f83743c7824ec647b21e33c5f691b4c9d
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Wed Jul 27 10:31:24 2011 +0200

    rebase to bugfix-only release 1.26 - fixes regression in --verify / -W option (#723726)

 .gitignore                |    2 ++
 sources                   |    4 ++--
 tar-1.22-atime-rofs.patch |    4 ++--
 tar.spec                  |   14 ++++++--------
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b76f1a4..adb5fae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ tar-1.23.tar.bz2.sig
 /tar-1.24.tar.xz.sig
 /tar-1.25.tar.xz
 /tar-1.25.tar.xz.sig
+/tar-1.26.tar.xz
+/tar-1.26.tar.xz.sig
diff --git a/sources b/sources
index a51df47..b6efdc0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1b3b391087f4baf70ccad8bd92e4db11  tar-1.25.tar.xz
-bc574a334e6f7bb6a7feb41ff4b2b080  tar-1.25.tar.xz.sig
+0ced6f20b9fa1bea588005b5ad4b52c1  tar-1.26.tar.xz
+6618d5fe7785e138c27d7d6a24e998b2  tar-1.26.tar.xz.sig
diff --git a/tar-1.22-atime-rofs.patch b/tar-1.22-atime-rofs.patch
index c9f3b08..12f022b 100644
--- a/tar-1.22-atime-rofs.patch
+++ b/tar-1.22-atime-rofs.patch
@@ -1,10 +1,10 @@
 diff -urNp tar-1.22-orig/src/create.c tar-1.22/src/create.c
 --- tar-1.22-orig/src/create.c	2009-05-15 10:50:38.000000000 +0200
 +++ tar-1.22/src/create.c	2009-05-15 10:51:52.000000000 +0200
-@@ -1691,7 +1691,8 @@ dump_file0 (struct tar_stat_info *st, co
- 	      set_exit_status (TAREXIT_DIFFERS);
+@@ -1827,7 +1827,8 @@ dump_file0 (struct tar_stat_info *st, co
  	    }
  	  else if (atime_preserve_option == replace_atime_preserve
+		   && fd && (is_dir || original_size != 0)
 -		   && set_file_atime (fd, parentfd, name, st->atime) != 0)
 +		   && set_file_atime (fd, parentfd, name, st->atime) != 0
 +		   && errno != EROFS )
diff --git a/tar.spec b/tar.spec
index 07716e2..74987d4 100644
--- a/tar.spec
+++ b/tar.spec
@@ -4,8 +4,8 @@
 Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
-Version: 1.25
-Release: 6%{?dist}
+Version: 1.26
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/tar/
@@ -30,10 +30,6 @@ Patch5: tar-1.22-atime-rofs.patch
 Patch6: tar-1.23-oldarchive.patch
 #temporarily disable sigpipe.at patch (fails at build in koji, passes manually)
 Patch7: tar-sigpipe.patch
-#fix failure with --one-file-system and --listed-incremental when archiving / (#654718)
-Patch8: tar-1.25-listedincremental.patch
-#Correctly store long sparse file names in PAX archives (#656834)
-Patch9: tar-1.25-sparse-names.patch
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
 %if %{WITH_SELINUX}
 BuildRequires: libselinux-devel
@@ -63,8 +59,6 @@ the rmt package.
 %patch5 -p1 -b .rofs
 %patch6 -p1 -b .oldarchive
 %patch7 -p1 -b .fail
-%patch8 -p1 -b .listed
-%patch9 -p1 -b .sparse
 
 autoreconf
 
@@ -126,6 +120,10 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Wed Jul 27 2011 Ondrej Vasik <ovasik at redhat.com> 2:1.26-1
+- rebase to bugfix-only release 1.26 - fixes regression
+  in --verify / -W option (#723726)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:1.25-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild