Merge pull request #2260 from whowutwut/gensis_base_revert

Revert the naming of xCAT-genesis-base back to using snap<date> and use Epoch instead

makerpm

@@ -165,9 +165,7 @@ function makegenesis {
 	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}

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

@@ -1,5 +1,4 @@
 %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
@@ -18,6 +17,7 @@ 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: 2
 AutoReq: false
 Prefix: /opt/xcat
 AutoProv: false

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} >= 2.13.0
+Requires: xCAT-genesis-base-%{tarch}
 
 Buildroot: %{_localstatedir}/tmp/xCAT-genesis
 Packager: IBM Corp.