rpms/cpio/devel cpio-2.6-rh.patch,1.1,1.2 cpio.spec,1.41,1.42

[fedora-cvs-commits at redhat.com]

Author: pvrabec

Update of /cvs/dist/rpms/cpio/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25405

Modified Files:
	cpio-2.6-rh.patch cpio.spec 
Log Message:
fix cpio --help output (#197597)


cpio-2.6-rh.patch:
 doc/cpio.info |    3 ++-
 src/main.c    |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Index: cpio-2.6-rh.patch
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio-2.6-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cpio-2.6-rh.patch	13 Jan 2005 13:59:49 -0000	1.1
+++ cpio-2.6-rh.patch	18 Jul 2006 15:25:32 -0000	1.2
@@ -1,5 +1,5 @@
---- 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
+--- cpio-2.6/doc/cpio.info.rh	2004-02-27 13:42:01.000000000 +0100
++++ cpio-2.6/doc/cpio.info	2006-07-18 17:10:52.000000000 +0200
 @@ -261,7 +261,8 @@
       Set the I/O block size to BLOCK-SIZE * 512 bytes.
  
@@ -10,8 +10,17 @@
  
  `-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
+--- cpio-2.6/src/main.c.rh	2004-11-23 01:42:18.000000000 +0100
++++ cpio-2.6/src/main.c	2006-07-18 17:18:10.000000000 +0200
+@@ -101,7 +101,7 @@
+   {"block-size", BLOCK_SIZE_OPTION, N_("BLOCK-SIZE"), 0,
+    N_("Set the I/O block size to BLOCK-SIZE * 512 bytes"), 110},
+   {NULL, 'c', NULL, 0,
+-   N_("Use the old portable (ASCII) archive format"), 0},
++   N_("Identical to \"-H newc\", use the new (SVR4) portable format.If you wish the old portable (ASCII) archive format, use \"-H odc\" instead."), 0},
+   {"dot", 'V', NULL, 0, 
+    N_("Print a \".\" for each file processed"), 110},
+   {"io-size", 'C', N_("NUMBER"), 0,
 @@ -302,6 +302,7 @@
      case 'c':		/* Use the old portable ASCII format.  */
        if (archive_format != arf_unknown)


Index: cpio.spec
===================================================================
RCS file: /cvs/dist/rpms/cpio/devel/cpio.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cpio.spec	12 Jul 2006 04:53:10 -0000	1.41
+++ cpio.spec	18 Jul 2006 15:25:32 -0000	1.42
@@ -6,7 +6,7 @@
 Summary: A GNU archiving program.
 Name: cpio
 Version: 2.6
-Release: 18.1
+Release: 19
 License: GPL
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -106,6 +106,9 @@
 %{_infodir}/*.info*
 
 %changelog
+* Tue Jul 18 2006 Peter Vrabec <pvrabec at redhat.com> 2.6-19
+- fix cpio --help output (#197597)
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 2.6-18.1
 - rebuild