From 31d7ca715a7b0d6602b42086869222e7f0a39aa9 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Mon, 3 May 2010 19:52:56 +0000 Subject: [PATCH] Moved atftp-xcat require so it isn't required on system z git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5946 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/xCAT.spec | 4 ++-- xCATsn/xCATsn.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 4cfe825b4..f5667718d 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -24,12 +24,12 @@ Conflicts: xCATsn Requires: xCAT-server xCAT-client perl-DBD-SQLite %ifos linux -Requires: atftp-xcat dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd +Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd %ifarch s390x # No additional requires for zLinux right now %else # yaboot-xcat is pulled in so any MN can manage ppc nodes -Requires: conserver yaboot-xcat perl-Net-Telnet +Requires: atftp-xcat conserver yaboot-xcat perl-Net-Telnet %endif %ifarch ppc64 Requires: perl-IO-Stty diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index b448d6d2e..0c2a6beca 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -25,11 +25,11 @@ Conflicts: xCAT %ifos linux # yaboot-xcat is pulled in so any SN can manage ppc nodes -Requires: atftp-xcat dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd +Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd %ifarch s390x # No additional requires for zLinux right now %else -Requires: conserver yaboot-xcat perl-Net-Telnet +Requires: atftp-xcat conserver yaboot-xcat perl-Net-Telnet %endif %endif