From 252da58c7842b6c976ed68351d383a59f7a2969b Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Tue, 16 Sep 2014 02:26:10 -0400
Subject: [PATCH] fix for bug 4272: do not check php rpm, check file existence
 instead

---
 xCAT-UI/xCAT-UI.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec
index d16f9a1d4..d866c741a 100644
--- a/xCAT-UI/xCAT-UI.spec
+++ b/xCAT-UI/xCAT-UI.spec
@@ -101,15 +101,13 @@ ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/bin/webportal
 # Inspect whether PHP related RPM packages are installed
 %ifos linux
 	if [ -e "/etc/redhat-release" ]; then
-		rpm -q php >/dev/null
-		if [ $? != 0 ]; then
+		if [ ! -e "/etc/httpd/conf.d/php.conf" ]; then
 			echo ""
 			echo "Error! php has not been installed. Please run 'yum install php' before installing xCAT-UI.";
 			exit -1;
 		fi
 	else 	# SUSE
-		rpm -q apache2-mod_php5 php5 >/dev/null
-		if [ $? != 0 ]; then
+		if [ ! -e "/etc/apache2/conf.d/php5.conf" ]; then
 			echo ""
 			echo "Error! apache2-mod_php5 and php5 have not been installed. Please run 'zypper install apache2-mod_php5 php5' before installing xCAT-UI."
 			exit -1;