From dc4a67cfe3aa4dfe16da3173ddc0ae1567368ca7 Mon Sep 17 00:00:00 2001
From: ligc <ligc@cn.ibm.com>
Date: Thu, 17 Apr 2014 22:55:20 -0500
Subject: [PATCH] fix for bug 4084: AIX rpm spec does not allow %if inside
 %ifos

---
 xCAT-server/xCAT-server.spec | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index de05d73ac..8f01cf83b 100755
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -27,10 +27,17 @@ AutoReqProv: no
 BuildArch: noarch
 Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser
 Obsoletes: atftp-xcat
+%endif
+
+# The aix rpm cmd forces us to do this outside of ifos type stmts
 %if %notpcm
+%ifos linux
+%ifnarch s390x
+# PCM does not use or ship conserver
 Requires: grub2-xcat
 %endif
 %endif
+%endif
 
 %if %fsm
 # nothing needed here