From 5d9aba4817fbf42f0df87a49015e1b04c3c1c89b Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Tue, 19 Jun 2012 00:31:31 +0000 Subject: [PATCH] Remove perl-Net-Telnet requirement from zvm build of xcat git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13123 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/xCAT-server.spec | 1 + xCATsn/xCATsn.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 253a760fb..a37b72d38 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -190,6 +190,7 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/windows.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xcat2nim.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xnba.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IPMI.pm +rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/SSHInteract.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/MellanoxIB.pm rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm # Can not remove this, because it is needed by Templates.pm diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 8ddbc9889..ab2b7ef81 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -25,7 +25,7 @@ Conflicts: xCAT %ifos linux # yaboot-xcat is pulled in so any SN can manage ppc nodes -Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser +Requires: dhcp httpd nfs-utils nmap bind perl-XML-Parser %ifarch ppc64 Requires: perl-IO-Stty %endif @@ -33,7 +33,7 @@ Requires: perl-IO-Stty # No additional requires for zLinux right now %else Requires: /etc/xinetd.d/tftp -Requires: conserver-xcat yaboot-xcat perl-Net-Telnet +Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping %endif %endif