From 985de0725fec3e7a787dd103eef72b35d8a1f309 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 9 Mar 2009 17:38:01 +0000
Subject: [PATCH] define default remote shell as /usr/bin/ssh(#452904), use
 /etc/rmt as     default rmt command

---
 cpio-2.9.90-defaultremoteshell.patch | 14 ++++++++++++++
 cpio.spec                            | 12 +++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 cpio-2.9.90-defaultremoteshell.patch

diff --git a/cpio-2.9.90-defaultremoteshell.patch b/cpio-2.9.90-defaultremoteshell.patch
new file mode 100644
index 0000000..6733c3b
--- /dev/null
+++ b/cpio-2.9.90-defaultremoteshell.patch
@@ -0,0 +1,14 @@
+diff -urNp cpio-2.9.90-orig/lib/rtapelib.c cpio-2.9.90/lib/rtapelib.c
+--- cpio-2.9.90-orig/lib/rtapelib.c	2007-08-12 09:57:15.000000000 +0200
++++ cpio-2.9.90/lib/rtapelib.c	2009-03-09 18:06:43.000000000 +0100
+@@ -59,6 +59,10 @@
+ # include <netdb.h>
+ #endif
+ 
++#ifndef REMOTE_SHELL
++# define REMOTE_SHELL "/usr/bin/ssh"
++#endif
++
+ #include <rmt.h>
+ #include <rmt-command.h>
+ 
diff --git a/cpio.spec b/cpio.spec
index 3a7add7..3aec5fb 100644
--- a/cpio.spec
+++ b/cpio.spec
@@ -3,7 +3,7 @@
 Summary: A GNU archiving program
 Name: cpio
 Version: 2.9.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Archiving
 URL: http://www.gnu.org/software/cpio/
@@ -17,9 +17,10 @@ Patch4: cpio-2.9-exitCode.patch
 Patch5: cpio-2.9-dir_perm.patch
 Patch6: cpio-2.9-dev_number.patch
 Patch7: cpio-2.9-sys_umask.patch
+Patch8: cpio-2.9.90-defaultremoteshell.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-BuildRequires: texinfo, autoconf, gettext
+BuildRequires: texinfo, autoconf, gettext, rmt
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -45,12 +46,13 @@ Install cpio if you need a program to manage file archives.
 %patch5  -p1 -b .dir_perm
 %patch6  -p1 -b .dev_number
 %patch7  -p1 -b .sys_umask
+%patch8  -p1 -b .defaultremote
 
 autoheader
 
 %build
 
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -pedantic -Wall" %configure
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -pedantic -Wall" %configure --with-rmt="%{_sysconfdir}/rmt"
 make %{?_smp_mflags}
 
 %install
@@ -85,6 +87,10 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Mon Mar  9 2009 Ondrej Vasik <ovasik@redhat.com> 2.9.90-5
+- define default remote shell as /usr/bin/ssh(#452904)
+- use /etc/rmt as default rmt command
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.90-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild