arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed double %pre in xCAT.spec and improved dhcp require

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12646 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
bp-sawyers
2012-05-11 21:13:40 +00:00
parent c82eea4b25
commit 9ffff27d86
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
xCAT/xCAT.spec
View File

@@ -24,8 +24,10 @@ Conflicts: xCATsn
Requires: xCAT-server xCAT-client perl-DBD-SQLite
%ifos linux
Requires: dhcp httpd nfs-utils nmap fping bind perl-XML-Parser perl(CGI)
Requires: httpd nfs-utils nmap fping bind perl-XML-Parser perl(CGI)
Requires: /etc/xinetd.d/tftp
# On RHEL this pulls in dhcp, on SLES it pulls in dhcp-server
Requires: /usr/sbin/dhcpd
%ifarch s390x
# No additional requires for zLinux right now
%else
@@ -66,18 +68,29 @@ tar -xf postscripts.tar
%build
%pre
if [ -e "/etc/SuSE-release" ]; then
# this is now handled by requiring /usr/sbin/dhcpd
#if [ -e "/etc/SuSE-release" ]; then
# In SuSE, dhcp-server provides the dhcp server, which is different from the RedHat.
# When building the package, we cannot add "dhcp-server" into the "Requires", because RedHat doesn't
# have such one package.
# so there's only one solution, Yes, it looks ugly.
rpm -q dhcp-server >/dev/null
if [ $? != 0 ]; then
echo ""
echo "!! On SuSE, the dhcp-server package should be installed before installing xCAT !!"
exit -1;
fi
#rpm -q dhcp-server >/dev/null
#if [ $? != 0 ]; then
# echo ""
# echo "!! On SuSE, the dhcp-server package should be installed before installing xCAT !!"
# exit -1;
#fi
#fi
# only need to check on AIX
%ifnos linux
if [ -x /usr/sbin/emgr ]; then # Check for emgr cmd
/usr/sbin/emgr -l 2>&1 | grep -i xCAT # Test for any xcat ifixes - msg and exit if found
if [ $? = 0 ]; then
echo "Error: One or more xCAT emgr ifixes are installed. You must use the /usr/sbin/emgr command to uninstall each xCAT emgr ifix prior to RPM installation."
exit 2
fi
fi
%endif
%install
@@ -123,17 +136,6 @@ cp %{SOURCE5} $RPM_BUILD_ROOT/etc/xCATMN
mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT
%pre
# only need to check on AIX
%ifnos linux
if [ -x /usr/sbin/emgr ]; then # Check for emgr cmd
/usr/sbin/emgr -l 2>&1 | grep -i xCAT # Test for any xcat ifixes - msg and exit if found
if [ $? = 0 ]; then
echo "Error: One or more xCAT emgr ifixes are installed. You must use the /usr/sbin/emgr command to uninstall each xCAT emgr ifix prior to RPM installation."
exit 2
fi
fi
%endif
%post
%ifnos linux