From 66ed74eb156a2a0f0a8c7395088621ed783db3f4 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 14 Dec 2016 09:00:19 -0500
Subject: [PATCH] Fix build issues with the genesis builder

---
 makegenesisbuilderrpm                          | 4 ++--
 xCAT-genesis-builder/xCAT-genesis-builder.spec | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/makegenesisbuilderrpm b/makegenesisbuilderrpm
index 40a5f4407..641fcbbca 100755
--- a/makegenesisbuilderrpm
+++ b/makegenesisbuilderrpm
@@ -16,9 +16,9 @@ then
 fi
 echo "The location for rpm building is ${RPMROOT}"
 cd `dirname $0`/xCAT-genesis-builder
-tar --exclude .svn -cjvf $RPMROOT/SOURCES/xCAT-genesis-builder.tar.bz2 .
+tar --exclude .svn --exclude .*.sw* -cjvf $RPMROOT/SOURCES/xCAT-genesis-builder.tar.bz2 .
 #mv -f *.gz $RPMROOT/SOURCES
-cp LICENSE.html $RPMROOT/BUILD
+#cp LICENSE.html $RPMROOT/BUILD
 cp xCAT-genesis-builder.spec $RPMROOT/SOURCES
 cd -
 rm -f $RPMROOT/SRPMS/xCAT-genesis-builder-$VER*rpm $RPMROOT/RPMS/*/xCAT-genesis-builder-$VER*rpm
diff --git a/xCAT-genesis-builder/xCAT-genesis-builder.spec b/xCAT-genesis-builder/xCAT-genesis-builder.spec
index 91d301d44..a8b1b30a2 100644
--- a/xCAT-genesis-builder/xCAT-genesis-builder.spec
+++ b/xCAT-genesis-builder/xCAT-genesis-builder.spec
@@ -16,7 +16,7 @@ License: EPL
 Vendor: IBM Corp.
 Summary: Tooling to create xCAT's discovery/maintenance/debugging environment
 URL:	 http://xcat.org
-Source1: xCAT-genesis-builder.tar.bz2
+Source: xCAT-genesis-builder.tar.bz2
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis-builder
 Packager: IBM Corp.
@@ -24,6 +24,7 @@ Packager: IBM Corp.
 %Description
 Genesis (Genesis Enhanced Netboot Environment for System Information and Servicing) is xCAT's netboot environment designed to perform hardware and firmware inventory, perform firmware updates/configuration, and perform troubleshooting.
 %Prep
+%setup -n xCAT-genesis-builder -c
 
 
 %Build
@@ -32,7 +33,7 @@ Genesis (Genesis Enhanced Netboot Environment for System Information and Servici
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder
 cd $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder
-tar jxvf %{SOURCE1}
+tar jxvf %{SOURCE0}
 chmod +x $RPM_BUILD_ROOT/%{prefix}/share/xcat/netboot/genesis/builder/buildrpm
 cd -