From 3f4342378f1672c6177fc87a37ffdd89fbe95355 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Fri, 16 Dec 2011 09:09:37 +0000 Subject: [PATCH] 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 --- xCAT-server/xCAT-server.spec | 1 + xCAT/xCAT.spec | 1 - xCATsn/xCATsn.spec | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 9ad657273..aebb63f22 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -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) diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index a96e021c2..9ae0bf891 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -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 diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index fbb642412..98d201d48 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -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