From ccf2ac78b57cf165b22de8c1dad37dab10251459 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 12 Nov 2012 13:05:01 +0000
Subject: [PATCH] Fixed build problem on aix with xCAT and xCATsn spec files

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

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 1773ffffc..4357beef9 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -36,7 +36,13 @@ Requires: /usr/bin/ssh
 Requires: /etc/xinetd.d/tftp
 # yaboot-xcat is pulled in so any MN can manage ppc nodes
 Requires: yaboot-xcat
+%endif
+%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: conserver-xcat
 %endif
@@ -47,7 +53,10 @@ Requires: conserver-xcat
 Requires: syslinux xCAT-genesis-x86_64 elilo-xcat
 Requires: ipmitool-xcat >= 1.8.9
 Requires: xnba-undi
+%endif
+
 %if %notpcm
+%ifarch i386 i586 i686 x86 x86_64
 # PCM does not need or ship syslinux-xcat
 Requires: syslinux-xcat
 %endif
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 288246596..d274fa2fc 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -33,7 +33,13 @@ Requires: /usr/bin/ssh
 Requires: /etc/xinetd.d/tftp
 # yaboot-xcat is pulled in so any MN can manage ppc nodes
 Requires: yaboot-xcat 
+%endif
+%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: conserver-xcat
 %endif
@@ -44,7 +50,10 @@ Requires: conserver-xcat
 Requires: syslinux xCAT-genesis-x86_64 elilo-xcat
 Requires: ipmitool-xcat >= 1.8.9
 Requires: xnba-undi
+%endif
+
 %if %notpcm
+%ifarch i386 i586 i686 x86 x86_64
 # PCM does not need or ship syslinux-xcat
 Requires: syslinux-xcat
 %endif