From 9a05a5ea1f2bb09537835360c11d15d8cf6cf72e Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Tue, 26 Aug 2014 04:29:01 -0400
Subject: [PATCH] fix the file <xxxxdirectory> from install of
 xCAT-genesis-scripts-ppc64-1:2.9-snap201408210348.noarch conflicts with file
 from package xCAT-genesis-base-ppc64-1:2.9-snap201408210346.noarch, if the
 rpms are built on RHEL 7 or Fedora 20

---
 .../xCAT-genesis-scripts.spec                 | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index 70ffe87e4..cc6f3f02b 100755
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -7,6 +7,7 @@
 %ifarch ppc ppc64
 %define tarch ppc64
 %endif
+%define rpminstallroot /opt/xcat/share/xcat/netboot/genesis/%{tarch}/fs
 BuildArch: noarch
 %define name	xCAT-genesis-scripts-%{tarch}
 %define __spec_install_post :
@@ -74,4 +75,33 @@ touch /etc/xcat/genesis-scripts-updated
 
 %Files
 %defattr(-,root,root)
-/opt/xcat/share/xcat/netboot/genesis/%{tarch}/fs
+#%dir %attr(-,root,root) %{rpminstallroot}
+%{rpminstallroot}/bin/allowcred.awk
+%{rpminstallroot}/bin/bmcsetup
+%{rpminstallroot}/bin/dodiscovery
+%{rpminstallroot}/bin/dosysclone
+%{rpminstallroot}/bin/doxcat
+%{rpminstallroot}/bin/getcert
+%{rpminstallroot}/bin/getdestiny
+%{rpminstallroot}/bin/getipmi
+%{rpminstallroot}/bin/ifup
+%{rpminstallroot}/bin/minixcatd.awk
+%{rpminstallroot}/bin/nextdestiny
+%{rpminstallroot}/bin/remoteimmsetup
+%{rpminstallroot}/bin/udpcat.awk
+%{rpminstallroot}/bin/updateflag.awk
+%{rpminstallroot}/debian/changelog
+%{rpminstallroot}/debian/compat
+%{rpminstallroot}/debian/control
+%{rpminstallroot}/debian/copyright
+%{rpminstallroot}/debian/dirs
+%{rpminstallroot}/debian/docs
+%{rpminstallroot}/debian/install
+%{rpminstallroot}/debian/postinst
+%{rpminstallroot}/debian/postrm
+%{rpminstallroot}/debian/preinst
+%{rpminstallroot}/debian/prerm
+%{rpminstallroot}/debian/rules
+%{rpminstallroot}/etc/init.d/functions
+%{rpminstallroot}/etc/udev/rules.d/99-imm.rules
+%{rpminstallroot}/sbin/setupimmnic