From 3ddfc48c0318062eb81130c711c0ea8be0852ae0 Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Tue, 13 Apr 2010 06:11:00 +0000 Subject: [PATCH] Remove openslp dependency from xCAT-server package, added openslp in xCAT package. The reason is that xCAT-server package is built with noarch, the ifarch check in xCAT-server is useless. Since xCAT package is still built with arch information, temperarily add openslp-xcat package in xCAT. One disadvantage is that if user only update xCAT-server package, openslp-xcat will still not be installed. But looks like this is the best way we can choose now. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5753 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/xCAT-server.spec | 3 --- xCAT/xCAT.spec | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index 74ddb34f0..493cf4734 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -21,9 +21,6 @@ AutoReqProv: no %ifos linux BuildArch: noarch Requires: perl-IO-Socket-SSL perl-XML-Simple perl-IO-Tty -%ifarch ppc64 x86_64 -Requires: openslp-xcat -%endif %endif Requires: perl-xCAT >= %{epoch}:%(cat Version|cut -d. -f 1,2) diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 491f0a616..6203b9791 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -34,6 +34,9 @@ Requires: conserver yaboot-xcat perl-Net-Telnet %ifarch ppc64 Requires: perl-IO-Stty %endif +%ifarch ppc64 x86_64 +Requires: openslp-xcat +%endif %endif %ifarch i386 i586 i686 x86 x86_64