From c0ad20c3cfb0d5a1a3ed929e0018b3da2d543cf4 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 7 Dec 2012 15:59:50 +0000
Subject: [PATCH] Further tweak the genesis repackaging

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14588 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-genesis-builder/install                   | 2 +-
 xCAT-genesis-builder/xCAT-genesis-base.spec    | 1 +
 xCAT-genesis-scripts/xCAT-genesis-scripts.spec | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xCAT-genesis-builder/install b/xCAT-genesis-builder/install
index 962fbc5d5..632408bfc 100755
--- a/xCAT-genesis-builder/install
+++ b/xCAT-genesis-builder/install
@@ -15,7 +15,7 @@ dracut_install chmod /lib/libc.so.6 /lib/ld-linux.so.2 /lib/libdl.so.2 /lib/libm
 dracut_install dmidecode /usr/lib64/libstdc++.so.6 #uxspi prereqs, but will use dmidecode to improve decision on loading ipmi_si
 dracut_install dmidecode /usr/lib64/libstdc++.so.5 #broadcom firmware update links against old lib
 dracut_install /lib/libpthread.so.0 #32 bit lib because UXSPI will not ship a native 64 bit build
-dracut_install /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s-4.4.6-20110824.so.1  /lib/libtinfo.so.5.7
+dracut_install /lib/libncurses.so.5.7 /usr/lib/libstdc++.so.6.0.13 /lib/libgcc_s.so.1  /lib/libtinfo.so.5.7
 dracut_install /lib64/libldap-2.4.so.2 /lib64/liblber-2.4.so.2 /usr/lib64/libsasl2.so.2 #uxspi has incurred these...
 dracut_install /usr/share/zoneinfo/posix/Zulu
 dracut_install /usr/share/zoneinfo/posix/GMT-0
diff --git a/xCAT-genesis-builder/xCAT-genesis-base.spec b/xCAT-genesis-builder/xCAT-genesis-base.spec
index 6187e76e9..b43d656ce 100644
--- a/xCAT-genesis-builder/xCAT-genesis-base.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-base.spec
@@ -18,6 +18,7 @@ Epoch: 1
 AutoReq: false
 Prefix: /opt/xcat
 AutoProv: false
+Obsoletes: xCAT-genesis-%{tarch}
 
 
 
diff --git a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
index 2073bae6a..bafa79193 100644
--- a/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
+++ b/xCAT-genesis-scripts/xCAT-genesis-scripts.spec
@@ -29,7 +29,8 @@ License: EPL
 Vendor: IBM Corp
 Summary: xCAT Genesis netboot image - Core content
 URL:	 http://xcat.org
-Source1: xCAT-genesis-scripts-%{tarch}.tar.bz2
+Source1: xCAT-genesis-scripts-%{version}.tar.bz2
+Requires: xCAT-genesis-base-%{tarch}
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis
 Packager: IBM Corp.
@@ -47,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT
 tar jxf %{SOURCE1}
+mkdir -p opt/xcat/share/xcat/netboot/genesis/x86_64/
+mv xCAT-genesis-scripts opt/xcat/share/xcat/netboot/genesis/x86_64/fs
+rm opt/xcat/share/xcat/netboot/genesis/x86_64/fs/*.spec
 cd -
 
 
@@ -60,4 +64,4 @@ fi
 
 %Files
 %defattr(-,root,root)
-/
+/opt/xcat/share/xcat/netboot/genesis/x86_64/fs