From 3f8c9bced2b159cf34bb1dedcc3dec52e68abfe5 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 9 Nov 2012 16:47:02 +0000
Subject: [PATCH] changed dhcp require to /usr/sbin/dhcpd so it is correct on
 sles too

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@14299 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/xCAT.spec     | 4 +++-
 xCATsn/xCATsn.spec | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index b0719b65f..52e87e5a9 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -24,7 +24,9 @@ Conflicts: xCATsn
 Requires: xCAT-server xCAT-client perl-DBD-SQLite
 
 %ifos linux
-Requires: dhcp httpd nfs-utils expect nmap bind perl-XML-Parser vsftpd perl(CGI)
+Requires: httpd nfs-utils expect nmap bind perl-XML-Parser vsftpd perl(CGI)
+# On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server
+Requires: /usr/sbin/dhcpd
 %ifnarch s390x
 Requires: /etc/xinetd.d/tftp
 # yaboot-xcat is pulled in so any MN can manage ppc nodes
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 9c1013a79..276247d43 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -24,7 +24,9 @@ Requires: perl-XML-Parser
 Conflicts: xCAT
 
 %ifos linux
-Requires: dhcp httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd
+Requires: httpd nfs-utils expect nmap fping bind perl-XML-Parser vsftpd
+# On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server
+Requires: /usr/sbin/dhcpd
 %ifnarch s390x
 Requires: /etc/xinetd.d/tftp
 # yaboot-xcat is pulled in so any SN can manage ppc nodes