support defining the release number

Author: timvaillancourt

Makefile

@@ -4,6 +4,7 @@
 NAME=mongodb_consistent_backup
 BIN_NAME?=mongodb-consistent-backup
 VERSION=$(shell cat VERSION | cut -d- -f1)
+RELEASE?=1
 GIT_COMMIT?=$(shell git show 2>/dev/null | awk 'NR==1{print $$2}')
 PREFIX?=/usr/local
 ARCH?=x86_64
@@ -17,7 +18,7 @@ MAKE_DIR=$(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
 all: bin/$(BIN_NAME)
 
 bin/$(BIN_NAME): setup.py requirements.txt README.rst VERSION scripts/build.sh $(NAME)/*.py $(NAME)/*/*.py $(NAME)/*/*/*.py
-	BIN_NAME=$(BIN_NAME) GIT_COMMIT=$(GIT_COMMIT) PYTHON_BIN=$(PYTHON_BIN) VIRTUALENV_BIN=$(VIRTUALENV_BIN) bash scripts/build.sh
+	BIN_NAME=$(BIN_NAME) RELEASE=$(RELEASE) GIT_COMMIT=$(GIT_COMMIT) PYTHON_BIN=$(PYTHON_BIN) VIRTUALENV_BIN=$(VIRTUALENV_BIN) bash scripts/build.sh
 
 install: bin/$(BIN_NAME)
 	mkdir -p $(BINDIR) $(SHAREDIR)/$(NAME) || true
@@ -35,14 +36,14 @@ rpm: bin/$(BIN_NAME)
 	cp -f $(MAKE_DIR)/{LICENSE,README.rst} build/rpm/SOURCES
 	cp -f $(MAKE_DIR)/bin/$(BIN_NAME) build/rpm/SOURCES/mongodb-consistent-backup
 	cp -f $(MAKE_DIR)/conf/mongodb-consistent-backup.example.conf build/rpm/SOURCES/mongodb-consistent-backup.conf
-	rpmbuild -D "_topdir $(MAKE_DIR)/build/rpm" -D "version $(VERSION)" -bb $(MAKE_DIR)/scripts/$(NAME).spec
+	rpmbuild -D "_topdir $(MAKE_DIR)/build/rpm" -D "version $(VERSION)" -D "release $(RELEASE)" -bb $(MAKE_DIR)/scripts/$(NAME).spec
 
 uninstall:
 	rm -f $(BINDIR)/mongodb-consistent-backup
 	rm -rf $(SHAREDIR)/$(NAME)
 
 # Build CentOS7 RPM (in Docker)
-build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-1.el7.centos.$(ARCH).rpm:
+build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-$(RELEASE).el7.centos.$(ARCH).rpm:
 	mkdir -p $(MAKE_DIR)/build/rpm/RPMS/$(ARCH)
 	docker run --rm \
 		-v "$(MAKE_DIR)/bin:/src/bin:Z" \
@@ -59,7 +60,7 @@ build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-1.el7.centos.$(ARCH).rpm:
 		-v "$(MAKE_DIR)/build/rpm/RPMS/$(ARCH):/src/build/rpm/RPMS/$(ARCH):Z" \
 		-it centos:centos7 \
 		/bin/bash -c "yum install -y python-devel python-virtualenv gcc make libffi-devel openssl-devel rpm-build && \
-			make -C /src GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.el7.centos.$(ARCH) rpm && \
+			make -C /src RELEASE=$(RELEASE) GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.el7.centos.$(ARCH) rpm && \
 			/src/bin/mongodb-consistent-backup.el7.centos.$(ARCH) --version"
 
 centos7: build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-1.el7.centos.$(ARCH).rpm
@@ -80,7 +81,7 @@ bin/mongodb-consistent-backup.debian8.$(ARCH):
 		-v "$(MAKE_DIR)/VERSION:/src/VERSION:Z" \
 		-it debian:jessie \
 		/bin/bash -c "apt-get update && apt-get install -y python2.7-minimal python2.7-dev python-virtualenv gcc make libffi-dev libssl-dev && \
-			make -C /src GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.debian8.$(ARCH).tmp && \
+			make -C /src RELEASE=$(RELEASE) GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.debian8.$(ARCH).tmp && \
 			mv -vf /src/bin/mongodb-consistent-backup.debian8.$(ARCH).tmp /src/bin/mongodb-consistent-backup.debian8.$(ARCH) && \
 			/src/bin/mongodb-consistent-backup.debian8.$(ARCH) --version"
 
@@ -102,13 +103,13 @@ bin/mongodb-consistent-backup.debian9.$(ARCH):
 		-v "$(MAKE_DIR)/VERSION:/src/VERSION:Z" \
 		-it debian:stretch \
 		/bin/bash -c "apt-get update && apt-get install -y python2.7-minimal python2.7-dev python-virtualenv gcc make libffi-dev libssl-dev && \
-			make -C /src GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.debian9.$(ARCH).tmp && \
+			make -C /src RELEASE=$(RELEASE) GIT_COMMIT=$(GIT_COMMIT) BIN_NAME=mongodb-consistent-backup.debian9.$(ARCH).tmp && \
 			mv -vf /src/bin/mongodb-consistent-backup.debian9.$(ARCH).tmp /src/bin/mongodb-consistent-backup.debian9.$(ARCH) && \
 			/src/bin/mongodb-consistent-backup.debian9.$(ARCH) --version"
 
 debian9: bin/mongodb-consistent-backup.debian9.$(ARCH)
 
-docker: build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-1.el7.centos.$(ARCH).rpm
+docker: build/rpm/RPMS/$(ARCH)/$(NAME)-$(VERSION)-$(RELEASE).el7.centos.$(ARCH).rpm
 	docker build --no-cache --tag $(DOCKER_TAG) .
 	docker tag $(DOCKER_TAG) $(NAME):latest
 	docker run --rm -it $(DOCKER_TAG) --version

scripts/mongodb_consistent_backup.spec

@@ -7,7 +7,7 @@
 
 Name:		mongodb_consistent_backup
 Version:	%{version}
-Release:	1%{?dist}
+Release:	%{release}%{?dist}
 Summary:	MongoDB Consistent Backup Tool
 
 Group:		Software/Database