Since using the both xCAT and xCATsn to Obsolete atftp-xcat will cause the yum failed with conflict of xCAT/xCATsn, then have to use the xCAT-server.spec to Obsolete the atftp-xcat
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11262 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
c85a5a81fb
commit
3f4342378f
@ -21,6 +21,7 @@ AutoReqProv: no
|
||||
%ifos linux
|
||||
BuildArch: noarch
|
||||
Requires: perl-IO-Socket-SSL perl-XML-Simple perl-IO-Tty perl-Crypt-SSLeay make
|
||||
Obsoletes: atftp-xcat
|
||||
%endif
|
||||
|
||||
Requires: perl-xCAT >= %{epoch}:%(cat Version|cut -d. -f 1,2)
|
||||
|
@ -29,7 +29,6 @@ Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd
|
||||
# No additional requires for zLinux right now
|
||||
%else
|
||||
# yaboot-xcat is pulled in so any MN can manage ppc nodes
|
||||
Obsoletes: atftp-xcat
|
||||
Requires: /etc/xinetd.d/tftp
|
||||
Requires: conserver-xcat yaboot-xcat perl-Net-Telnet
|
||||
%endif
|
||||
|
@ -32,7 +32,6 @@ Requires: perl-IO-Stty
|
||||
%ifarch s390x
|
||||
# No additional requires for zLinux right now
|
||||
%else
|
||||
Obsoletes: atftp-xcat
|
||||
Requires: /etc/xinetd.d/tftp
|
||||
Requires: conserver-xcat yaboot-xcat perl-Net-Telnet
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user