From dccdd65a417c74df47a3e0e9e16c8a72970c8c63 Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Mon, 8 Nov 2004 08:48:24 +0000
Subject: [PATCH] *** empty log message ***

---
 .cvsignore              |  1 +
 cpio-2.5-nolibnsl.patch | 11 -----------
 cpio.spec               | 24 +++++++++++-------------
 sources                 |  2 +-
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 cpio-2.5-nolibnsl.patch

diff --git a/.cvsignore b/.cvsignore
index c9d0616..7e8c3ac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 cpio-2.5.tar.gz
+cpio-2.5.90.tar.gz
diff --git a/cpio-2.5-nolibnsl.patch b/cpio-2.5-nolibnsl.patch
deleted file mode 100644
index f219218..0000000
--- a/cpio-2.5-nolibnsl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpio-2.5/configure.lr	2003-09-12 06:26:31.000000000 -0600
-+++ cpio-2.5/configure	2003-09-12 06:27:20.000000000 -0600
-@@ -1940,7 +1940,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lnsl  $LIBS"
-+LIBS="-lXXXnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1945 "configure"
- #include "confdefs.h"
diff --git a/cpio.spec b/cpio.spec
index 95552d1..50e2c2e 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -5,18 +5,15 @@
 
 Summary: A GNU archiving program.
 Name: cpio
-Version: 2.5
-Release: 9
+Version: 2.5.90
+Release: 1
 License: GPL
 Group: Applications/Archiving
 URL: ftp://ftp.gnu.org/pub/gnu/cpio/
-Source: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.tar.gz
-Patch0: cpio-2.5-rh.patch
-Patch10: cpio-2.4.2-freebsd.patch
-Patch11: cpio-2.4.2-bug56346.patch
-Patch12: cpio-2.5-i18n-0.1.patch
-Patch13: cpio-2.5-nolibnsl.patch
-Patch14: cpio-2.5-lfs.patch
+Source: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.90.tar.gz
+Patch0: cpio-2.5.90-rh.patch
+Patch13: cpio-2.5.90-nolibnsl.patch
+Patch14: cpio-2.5.90-lfs.patch
 
 %ifnos linux
 Prereq: /sbin/rmt
@@ -42,10 +39,7 @@ Install cpio if you need a program to manage file archives.
 %prep
 %setup -q
 %patch0 -p1 -b .rh
-#%patch10 -p1 -b .fbsd
-#%patch11 -p1 -b .multilink
-%patch12 -p1 -b .i18n
-%patch13 -p1
+%patch13 -p1 -b .nolibnsl
 %patch14 -p1 -b .lfs
 
 %build
@@ -92,8 +86,12 @@ fi
 %{_mandir}/man*/*
 
 %{_infodir}/*.info*
+%{_datadir}/locale/*
 
 %changelog
+* Mon Nov 08 2004 Peter Vrabec <pvrabec@redhat.com>
+- update to 2.5.9
+
 * Mon Nov 01 2004 Peter Vrabec <pvrabec@redhat.com>
 - support large files > 2GB (#105617)
 
diff --git a/sources b/sources
index 31637e9..889695d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e02859af1bbbbd73fcbf757acb57e0a4  cpio-2.5.tar.gz
+541eeb1bc5e2e7ac2545d3112a878018  cpio-2.5.90.tar.gz