From 08919eda58fc97b25ddb428029b80efa802aaf1b Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 12 Jul 2012 17:57:17 +0000
Subject: [PATCH] Pkging changes: don't require fping on zvm, clean up zvm's
 removal of files, remove openslp-xcat require for all platforms

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13287 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/lsslp.pm |  4 ++--
 xCAT-server/xCAT-server.spec          |  8 ++++----
 xCAT/xCAT.spec                        | 11 +++--------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index fad875bc3..51f8ef799 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -39,8 +39,8 @@ use constant {
     SERVICE_CMM      => "chassis-management-module",
     SERVICE_RSA      => "remote-supervisor-adapter",
     SERVICE_RSA2     => "remote-supervisor-adapter-2",
-    SLP_CONF         => "/usr/local/etc/slp.conf",
-    SLPTOOL          => "/usr/local/bin/slptool",
+    #SLP_CONF         => "/usr/local/etc/slp.conf",
+    #SLPTOOL          => "/usr/local/bin/slptool",
     TYPE_MM          => "mm",
     TYPE_CMM         => "cmm",
     TYPE_RSA         => "rsa",
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index 16124a4b5..3e3130a87 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -159,8 +159,7 @@ chmod 644 $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_schema/samples/*
 %if %zvm
 rm $RPM_BUILD_ROOT/%{prefix}/sbin/stopstartxcatd
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/activedirectory.pm
-# this is needed by lsslp.pm
-#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/blade.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpblade.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hpilo.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ipmi.pm
@@ -171,6 +170,7 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xen.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/kvm.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/vbox.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/aixinstall.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/slpdiscover.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bmcconfig.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/bpa.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/esx.pm
@@ -178,14 +178,14 @@ rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/FIP.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/fsp.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/hmc.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/ivm.pm
-# this is needed by PPCdb.pm in perl-xCAT
-#rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/lsslp.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/lsslp.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/pxe.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/toolscenter.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/windows.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xcat2nim.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT_plugin/xnba.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/IPMI.pm
+rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/SSHInteract.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/MellanoxIB.pm
 rm $RPM_BUILD_ROOT/%{prefix}/lib/perl/xCAT/PPC.pm
 # Can not remove this, because it is needed by Templates.pm
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 7ea9e6190..aaa604206 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -24,20 +24,15 @@ Conflicts: xCATsn
 Requires: xCAT-server xCAT-client perl-DBD-SQLite
 
 %ifos linux
-Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd perl(CGI)
+Requires: dhcp httpd nfs-utils expect nmap bind perl-XML-Parser vsftpd perl(CGI)
 Requires: /etc/xinetd.d/tftp
-%ifarch s390x
-# No additional requires for zLinux right now
-%else
+%ifnarch s390x
 # yaboot-xcat is pulled in so any MN can manage ppc nodes
-Requires: conserver-xcat yaboot-xcat perl-Net-Telnet
+Requires: conserver-xcat yaboot-xcat perl-Net-Telnet fping
 %endif
 %ifarch ppc64
 Requires: perl-IO-Stty
 %endif
-%ifarch ppc64 x86_64
-Requires: openslp-xcat
-%endif
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64