[tar] new upstream release 1.25

[Ondrej Vasik]

commit 3572b22233b907674045039a293c126e1cd3d159
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Mon Nov 8 12:07:14 2010 +0100

    new upstream release 1.25

 .gitignore                           |    2 +
 sources                              |    4 +-
 tar-1.22-fortifysourcessigabrt.patch |   32 -----------
 tar-1.24-extractingdirs.patch        |   98 ----------------------------------
 tar.spec                             |   23 +++-----
 5 files changed, 12 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f299b4..b76f1a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ tar-1.23.tar.bz2
 tar-1.23.tar.bz2.sig
 /tar-1.24.tar.xz
 /tar-1.24.tar.xz.sig
+/tar-1.25.tar.xz
+/tar-1.25.tar.xz.sig
diff --git a/sources b/sources
index 6ed60e5..a51df47 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-debae443de7e1c61cd24c2d53bca50c6  tar-1.24.tar.xz
-c4beee21bbab83cd022093825371eed5  tar-1.24.tar.xz.sig
+1b3b391087f4baf70ccad8bd92e4db11  tar-1.25.tar.xz
+bc574a334e6f7bb6a7feb41ff4b2b080  tar-1.25.tar.xz.sig
diff --git a/tar.spec b/tar.spec
index 4bbf39e..3f515b4 100644
--- a/tar.spec
+++ b/tar.spec
@@ -4,7 +4,7 @@
 Summary: A GNU file archiving program
 Name: tar
 Epoch: 2
-Version: 1.24
+Version: 1.25
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
@@ -26,17 +26,10 @@ Patch4: tar-1.17-wildcards.patch
 #ignore errors from setting utime() for source file
 #on read-only filesystem (#500742)
 Patch5: tar-1.22-atime-rofs.patch
-#Do not sigabrt with new gcc/glibc because of writing to
-#struct members of gnutar header at once via strcpy
-Patch6: tar-1.22-fortifysourcessigabrt.patch
 #oldarchive option was not working(#594044)
-Patch7: tar-1.23-oldarchive.patch
-#match non-stripped file names (#637085)
-Patch8: tar-1.24-stripcomponents.patch
-#fix bug with -C and extracting directories
-Patch9: tar-1.24-extractingdirs.patch
+Patch6: tar-1.23-oldarchive.patch
 #temporarily disable sigpipe.at patch (fails at build in koji, passes manually)
-Patch10: tar-sigpipe.patch
+Patch7: tar-sigpipe.patch
 Requires: info
 BuildRequires: autoconf automake gzip texinfo gettext libacl-devel gawk rsh
 %if %{WITH_SELINUX}
@@ -65,11 +58,8 @@ the rmt package.
 %patch3 -p1 -b .xattrs
 %patch4 -p1 -b .wildcards
 %patch5 -p1 -b .rofs
-%patch6 -p1 -b .fortify
-%patch7 -p1 -b .oldarchive
-%patch9 -p1 -b .extractC
-%patch8 -p1 -b .stripcomponents
-%patch10 -p1 -b .fail
+%patch6 -p1 -b .oldarchive
+%patch7 -p1 -b .fail
 
 autoreconf
 
@@ -131,6 +121,9 @@ fi
 %{_infodir}/tar.info*
 
 %changelog
+* Mon Nov 08 2010 Ondrej Vasik <ovasik at redhat.com> 2:1.25-1
+- new upstream release 1.25
+
 * Mon Oct 25 2010 Ondrej Vasik <ovasik at redhat.com> 2:1.24-1
 - new upstream release 1.24, use .xz archive