From e03209111599e5952e4a9b389063757aed8ec13f Mon Sep 17 00:00:00 2001
From: Peter Vrabec <pvrabec@fedoraproject.org>
Date: Thu, 13 Jan 2005 13:59:49 +0000
Subject: [PATCH] upgrade to 2.6

---
 .cvsignore              |  3 +--
 cpio-2.5-nolibnsl.patch | 11 +++++++++++
 cpio-2.6-rh.patch       | 22 ++++++++++++++++++++++
 cpio.spec               | 30 +++++++++++++++++-------------
 sources                 |  2 +-
 5 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 cpio-2.5-nolibnsl.patch
 create mode 100644 cpio-2.6-rh.patch

diff --git a/.cvsignore b/.cvsignore
index 7e8c3ac..725be2c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-cpio-2.5.tar.gz
-cpio-2.5.90.tar.gz
+cpio-2.6.tar.gz
diff --git a/cpio-2.5-nolibnsl.patch b/cpio-2.5-nolibnsl.patch
new file mode 100644
index 0000000..581a1fc
--- /dev/null
+++ b/cpio-2.5-nolibnsl.patch
@@ -0,0 +1,11 @@
+--- cpio-2.5/configure.nolibnsl	2004-09-08 11:43:38.000000000 +0000
++++ cpio-2.5/configure	2004-11-04 12:44:10.093187568 +0000
+@@ -13564,7 +13564,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl  $LIBS"
++LIBS="-lXXXnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
diff --git a/cpio-2.6-rh.patch b/cpio-2.6-rh.patch
new file mode 100644
index 0000000..ffad290
--- /dev/null
+++ b/cpio-2.6-rh.patch
@@ -0,0 +1,22 @@
+--- cpio-2.5.90/doc/cpio.info.rh	2004-02-27 12:42:01.000000000 +0000
++++ cpio-2.5.90/doc/cpio.info	2004-11-04 14:40:57.000000000 +0000
+@@ -261,7 +261,8 @@
+      Set the I/O block size to BLOCK-SIZE * 512 bytes.
+ 
+ `-c'
+-     Use the old portable (ASCII) archive format.
++     Identical to "-H newc", use the new (SVR4) portable format.
++     If you wish the old portable (ASCII) archive format, use "-H odc" instead.
+ 
+ `-C IO-SIZE, --io-size=IO-SIZE'
+      Set the I/O block size to IO-SIZE bytes.
+--- cpio-2.5.90/src/main.c.rh	2004-09-08 11:41:42.000000000 +0000
++++ cpio-2.5.90/src/main.c	2004-11-05 11:09:59.869355664 +0000
+@@ -302,6 +302,7 @@
+     case 'c':		/* Use the old portable ASCII format.  */
+       if (archive_format != arf_unknown)
+ 	USAGE_ERROR ((0, 0, _("Archive format multiply defined")));
++#define SVR4_COMPAT
+ #ifdef SVR4_COMPAT
+       archive_format = arf_newascii; /* -H newc.  */
+ #else
diff --git a/cpio.spec b/cpio.spec
index 2669525..bc5c8e2 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -5,19 +5,19 @@
 
 Summary: A GNU archiving program.
 Name: cpio
-Version: 2.5
-Release: 10
+Version: 2.6
+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
+URL: http://www.gnu.org/software/cpio/
+Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.gz
+Patch0: cpio-2.6-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
-Patch15: cpio-2.5-time.patch
+#Patch15: cpio-2.5-time.patch
 
 %ifnos linux
 Prereq: /sbin/rmt
@@ -45,10 +45,10 @@ Install cpio if you need a program to manage file archives.
 %patch0 -p1 -b .rh
 #%patch10 -p1 -b .fbsd
 #%patch11 -p1 -b .multilink
-%patch12 -p1 -b .i18n
-%patch13 -p1
+##%patch12 -p1 -b .i18n
+%patch13 -p1 -b .nolibnsl
 %patch14 -p1 -b .lfs
-%patch15 -p1 -b .time
+#%patch15 -p1 -b .time
 
 %build
 
@@ -85,7 +85,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc README NEWS
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 
 %ifnos linux
 %{_libexecdir}/*
@@ -94,8 +94,12 @@ fi
 %{_mandir}/man*/*
 
 %{_infodir}/*.info*
+%{_datadir}/locale/*
 
 %changelog
+* Thu Jan 13 2005 Peter Vrabec <pvrabec@redhat.com>
+- upgrade to cpio-2.6
+
 * Tue Nov 09 2004 Peter Vrabec <pvrabec@redhat.com>
 - fixed "cpio -oH ustar (or tar) saves bad mtime date after Jan 10 2004" (#114580)
 
diff --git a/sources b/sources
index 31637e9..ccfbc4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e02859af1bbbbd73fcbf757acb57e0a4  cpio-2.5.tar.gz
+76b4145f33df088a5bade3bf4373d17d  cpio-2.6.tar.gz