add genesis and elilo requires to xCATsn and straighten out XML requires

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14118 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
bp-sawyers 2012-10-25 09:12:25 +00:00
parent c3c7e46312
commit 34c4df71cd
4 changed files with 11 additions and 14 deletions

View File

@ -25,7 +25,7 @@ Requires: perl-xCAT >= %{epoch}:%(cat Version)
# fping or nmap is needed by pping (in case xCAT-client is installed by itself on a remote client)
%ifos linux
Requires: nmap
Requires: nmap perl-XML-Simple perl-XML-Parser
%else
Requires: expat
%endif

View File

@ -20,7 +20,7 @@ AutoReqProv: no
# also need to fix Requires for AIX
%ifos linux
BuildArch: noarch
Requires: perl-IO-Socket-SSL perl-XML-Simple
Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser
Obsoletes: atftp-xcat
%endif

View File

@ -24,7 +24,7 @@ Conflicts: xCATsn
Requires: xCAT-server xCAT-client perl-DBD-SQLite
%ifos linux
Requires: httpd nfs-utils nmap bind perl-XML-Parser perl(CGI)
Requires: httpd nfs-utils nmap bind perl(CGI)
# On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server
Requires: /usr/sbin/dhcpd
# On RHEL this pulls in openssh-server, on SLES it pulls in openssh
@ -37,8 +37,6 @@ Requires: conserver-xcat yaboot-xcat
%endif
%ifarch i386 i586 i686 x86 x86_64
# All versions of the nb rpms are pulled in so an x86 MN can manage nodes of any arch.
# The nb rpms are used for dhcp-based discovery, and flashing, so for now we do not need them on a ppc MN.
Requires: syslinux xCAT-genesis-x86_64 elilo-xcat
Requires: ipmitool-xcat >= 1.8.9
Requires: xnba-undi syslinux-xcat

View File

@ -15,27 +15,26 @@ Source1: xcat.conf
Source2: license.tar.gz
Source3: xCATSN
Provides: xCATsn = %{version}
Requires: xCAT-server xCAT-client perl-xCAT perl-DBD-SQLite
%ifos linux
Requires: perl-XML-Parser
%endif
Requires: xCAT-server xCAT-client perl-DBD-SQLite
Conflicts: xCAT
%ifos linux
# yaboot-xcat is pulled in so any SN can manage ppc nodes
Requires: dhcp httpd nfs-utils nmap bind perl-XML-Parser
Requires: httpd nfs-utils nmap bind
# On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server
Requires: /usr/sbin/dhcpd
# On RHEL this pulls in openssh-server, on SLES it pulls in openssh
Requires: /usr/bin/ssh
%ifnarch s390x
Requires: /etc/xinetd.d/tftp
# yaboot-xcat is pulled in so any MN can manage ppc nodes
Requires: conserver-xcat yaboot-xcat
%endif
%endif
%ifarch i386 i586 i686 x86 x86_64
# All versions of the nb rpms are pulled in so an x86 MN can manage nodes of any arch.
# The nb rpms are used for dhcp-based discovery, and flashing, so for now we do not need them on a ppc MN.
Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 xCAT-nbroot-oss-ppc64 xCAT-nbroot-core-ppc64 xCAT-nbkernel-ppc64 syslinux
Requires: syslinux xCAT-genesis-x86_64 elilo-xcat
Requires: ipmitool-xcat >= 1.8.9
Requires: xnba-undi syslinux-xcat
%endif