From 600e03623630da6462c0e8fbfd2bddaaf03ae2e7 Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Mon, 21 Apr 2014 22:36:25 -0700
Subject: [PATCH] Fixup buildsystem for jenkins EL builds

---
 Makefile | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 371c14b..b3ea607 100755
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
-VERSION:=$(shell if [ -d .git ]; then bash -c 'bash ./gitversion.sh | grep "^MAJOR=" | cut -d = -f 2'; else source version.sh && echo $$MAJOR ; fi)
-RELEASE:=$(shell if [ -d .git ]; then bash -c 'bash ./gitversion.sh | grep "^BUILD=" | cut -d = -f 2'; else source version.sh && echo $$BUILD ; fi)
+VERSION:=$(shell if [ -d .git ]; then bash -c 'gitversion.sh | grep "^MAJOR=" | cut -d = -f 2'; else source version.sh && echo $$MAJOR ; fi)
+RELEASE:=$(shell if [ -d .git ]; then bash -c 'gitversion.sh | grep "^BUILD=" | cut -d = -f 2'; else source version.sh && echo $$BUILD ; fi)
 DISTFILE=./dist/versioners-$(VERSION)-$(RELEASE).tar.gz
 SPECFILE=versioners.spec
-SRPM=versioners-$(VERSION)-$(RELEASE).src.rpm
+
 ifndef RHEL_VERSION
 	RHEL_VERSION=5
 endif
-RPM=versioners-$(VERSION)-$(RELEASE).noarch.rpm
 ifeq ($(RHEL_VERSION),5)
 	MOCKFLAGS=--define "_source_filedigest_algorithm md5" --define "_binary_filedigest_algorithm md5"
 endif
@@ -14,6 +13,11 @@ ifndef PREFIX
 	PREFIX=''
 endif
 
+RHEL_RELEASE:=$(RELEASE).el$(RHEL_VERSION)
+SRPM=versioners-$(VERSION)-$(RHEL_RELEASE).src.rpm
+RPM=versioners-$(VERSION)-$(RHEL_RELEASE).noarch.rpm
+RHEL_DISTFILE=./dist/cmdarg-$(VERSION)-$(RHEL_RELEASE).tar.gz
+
 DISTFILE_DEPS=$(shell find . -type f | grep -Ev '\.git|\./dist/|$(DISTFILE)')
 
 all: ./dist/$(RPM)
@@ -22,7 +26,7 @@ all: ./dist/$(RPM)
 
 .PHONY: clean srpm rpm gitclean dist
 clean:
-	rm -f $(DISTFILE)
+	rm -f $(DISTFILE) $(RHEL_DISTFILE)
 	rm -fr dist/versioners-$(VERSION)-$(RELEASE)*
 
 version.sh:
@@ -39,8 +43,6 @@ gitclean:
 
 # --- End phony targets
 
-# This was borrowed from distiller, and I think it's to prevent version.sh
-# from updating unnecessarily
 version.sh:
 	if [ ! -d .git ] && [ -f version.sh ]; then echo "No git, keeping old version.sh" ; fi ; \
 	if [ ! -d .git ] && [ ! -f version.sh ]; then echo "No git and no version.sh, you're boned"; exit 1; fi ; \
@@ -59,13 +61,18 @@ $(DISTFILE): version.sh
 	rsync -aWH . --exclude=.git --exclude=dist ./dist/versioners-$(VERSION)-$(RELEASE)/
 	cd dist && tar -czvf ../$@ versioners-$(VERSION)-$(RELEASE)
 
-./dist/$(SRPM): $(DISTFILE)
+$(RHEL_DISTFILE): $(DISTFILE)
+       cd dist && \
+               cp -R versioners-$(VERSION)-$(RELEASE) versioners-$(VERSION)-$(RHEL_RELEASE) && \
+               tar -czvf ../$@ versioners-$(VERSION)-$(RHEL_RELEASE)
+
+./dist/$(SRPM): $(RHEL_DISTFILE)
 	rm -fr ./dist/$(SRPM)
-	/usr/bin/mock --buildsrpm --spec $(SPECFILE) $(MOCKFLAGS) --sources ./dist/ --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RELEASE)"
+	/usr/bin/mock --verbose -r epel-$(RHEL_VERSION)-noarch --buildsrpm --spec $(SPECFILE) $(MOCKFLAGS) --sources ./dist/ --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RHEL_RELEASE)"
 
 ./dist/$(RPM): ./dist/$(SRPM)
 	rm -fr ./dist/$(RPM)
-	/usr/bin/mock -r epel-$(RHEL_VERSION)-noarch ./dist/$(SRPM) --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RELEASE)"
+	/usr/bin/mock --verbose -r epel-$(RHEL_VERSION)-noarch ./dist/$(SRPM) --resultdir ./dist/ --define "version $(VERSION)" --define "release $(RHEL_RELEASE)"
 
 uninstall:
 	rm -f $(PREFIX)/usr/bin/taggit.sh