From e8a1fc34ad3891e8b739278a909dbd91c56b9f4e Mon Sep 17 00:00:00 2001
From: Anders Blomdell <anders.blomdell@control.lth.se>
Date: Tue, 8 Jul 2014 15:36:45 +0200
Subject: Make RPM's with current git tag

1. clear autom4te.cache
2. autogen.sh
3. configure --with-previous-options

Change-Id: I90c1820d22207d18b1bb367444b21918467baea5
BUG: 1117921
Signed-off-by: Anders Blomdell <anders.blomdell@control.lth.se>
Reviewed-on: http://review.gluster.org/8293
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
---
 extras/LinuxRPM/Makefile.am      | 17 ++++++++++++-----
 extras/LinuxRPM/make_glusterrpms |  9 +++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100755 extras/LinuxRPM/make_glusterrpms

(limited to 'extras/LinuxRPM')

diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am
index b82c65f02c4..64b6f2a90eb 100644
--- a/extras/LinuxRPM/Makefile.am
+++ b/extras/LinuxRPM/Makefile.am
@@ -6,15 +6,22 @@ GFS_TAR = ../../glusterfs-$(VERSION).tar.gz
 all:
 	@echo "To build RPMS run 'make glusterrpms'"
 
-.PHONY: glusterrpms prep srcrpm testsrpm clean
+.PHONY: glusterrpms glusterrpms_without_autogen
+.PHONY: autogen prep srcrpm testsrpm clean
 
-glusterrpms: prep srcrpm rpms
+glusterrpms: autogen glusterrpms_without_autogen
+
+glusterrpms_without_autogen: prep srcrpm rpms
 	-rm -rf rpmbuild
 
+autogen:
+	cd /../.. \
+	&& rm -rf autom4te.cache \
+	&&  ./autogen.sh \
+	&&  ./configure --with-previous-options
+
 prep:
-	if [ ! -e $(GFS_TAR) ]; then \
-		$(MAKE) -C ../.. dist; \
-	fi
+	$(MAKE) -C ../.. dist;
 	-mkdir -p rpmbuild/BUILD
 	-mkdir -p rpmbuild/SPECS
 	-mkdir -p rpmbuild/RPMS
diff --git a/extras/LinuxRPM/make_glusterrpms b/extras/LinuxRPM/make_glusterrpms
new file mode 100755
index 00000000000..3156af97870
--- /dev/null
+++ b/extras/LinuxRPM/make_glusterrpms
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+(
+    cd $(realpath $(dirname $0))/../.. || exit 1
+    rm -rf autom4te.cache
+    ./autogen.sh || exit 1
+    ./configure --with-previous-options || exit 1
+)
+make -C $(realpath $(dirname $0)) glusterrpms_without_autogen
-- 
cgit