- Bump up the version to 2.13.0

- Edit the makerpm to replace version of xCAT-genesis-base.spec
  file so there's no need to manually set the VERSION.  We
  do need a better way for the RELEASE variable
- Require xCAT-genesis-base >= 2.13.0 for the rebuild of genesis-base
- Clean up the builder rpm to include directories to clean up correctly
  on rpm removal

Version

@@ -1 +1 @@
-2.13
+2.13.0

makerpm

@@ -162,9 +162,15 @@ function makeironic {
 # Make the xCAT-genesis rpm
 function makegenesis {
 	DIR="xCAT-genesis-builder"
+	SPEC_FILE="xCAT-genesis-base.spec"
 	RPMNAME="$1"
 	cd `dirname $0`/$DIR
+	GEN_BASE_REL=0
+	sed -i s/%%REPLACE_CURRENT_VERSION%%/${VER}/g ${SPEC_FILE}
+	sed -i s/%%REPLACE_RELEASE%%/${GEN_BASE_REL}/g ${SPEC_FILE}
 	tar --exclude .svn -cjf $RPMROOT/SOURCES/$RPMNAME.tar.bz2 .
+	# undo the changes from the SED command above so it's not tracked by Git
+        git checkout ${SPEC_FILE}
 	cp LICENSE.html $RPMROOT/BUILD
 	cp $RPMNAME.spec $RPMROOT/SOURCES
 	cd - >/dev/null

xCAT-genesis-builder/xCAT-genesis-base.spec

@@ -1,4 +1,5 @@
-%define version        2.12
+%define version     %%REPLACE_CURRENT_VERSION%%
+%define release     %%REPLACE_RELEASE%%
 Version: %{?version:%{version}}%{!?version:%(cat Version)}
 Release: %{?release:%{release}}%{!?release:snap%(date +"%Y%m%d%H%M")}
 %ifarch i386 i586 i686 x86
@@ -17,13 +18,10 @@ BuildArch: noarch
 %define __prelink_undo_cmd %{nil}
 # To fix the issue error: Arch dependent binaries in noarch package, the following line is needed on Fedora 23 ppc64
 %define _binaries_in_noarch_packages_terminate_build   0
-Epoch: 1
 AutoReq: false
 Prefix: /opt/xcat
 AutoProv: false
 
-
-
 Name:	 %{name}
 Group: System/Utilities
 License: Various (see individual packages for details)

xCAT-genesis-builder/xCAT-genesis-builder.spec

@@ -40,4 +40,10 @@ cd -
 %Files
 %defattr(-,root,root)
 %doc LICENSE.html
-/opt/xcat/share/xcat/netboot/genesis/builder
+%dir %{prefix}
+%dir %{prefix}/share
+%dir %{prefix}/share/xcat
+%dir %{prefix}/share/xcat/netboot
+%dir %{prefix}/share/xcat/netboot/genesis
+%dir %{prefix}/share/xcat/netboot/genesis/builder
+%{prefix}/share/xcat/netboot/genesis/builder/*

xCAT-genesis-scripts/xCAT-genesis-scripts.spec

@@ -31,7 +31,7 @@ Vendor: IBM Corp
 Summary: xCAT Genesis netboot image - Core content
 URL:	 http://xcat.org
 Source1: xCAT-genesis-scripts.tar.bz2
-Requires: xCAT-genesis-base-%{tarch}
+Requires: xCAT-genesis-base-%{tarch} >= 2.13.0
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis
 Packager: IBM Corp.