From ce2dead4c09fa24ea0258a88435daec42eb2e63b Mon Sep 17 00:00:00 2001
From: Joan Touzet <joant@atypical.net>
Date: Fri, 20 Oct 2017 23:52:25 -0400
Subject: [PATCH] Cleanups for 2.1.1 proper version tagging

---
 Makefile           | 17 +----------------
 rel/reltool.config |  2 +-
 version.mk         |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 518dbade50f..248dddc58ea 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ include version.mk
 
 REBAR?=$(shell echo `pwd`/bin/rebar)
 IN_RELEASE = $(shell if [ ! -d .git ]; then echo true; fi)
-COUCHDB_VERSION_SUFFIX = $(shell if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi)
+COUCHDB_VERSION_SUFFIX = $(shell if [ ! -z "$(COUCH_RC)" ]; then echo '-RC$(COUCH_RC)'; else if [ -d .git ]; then echo '-`git rev-parse --short --verify HEAD`'; fi; fi)
 COUCHDB_VERSION = $(vsn_major).$(vsn_minor).$(vsn_patch)$(COUCHDB_VERSION_SUFFIX)
 
 DESTDIR=
@@ -354,21 +354,6 @@ uninstall:
 	@rm -rf $(DESTDIR)/$(html_dir)
 	@rm -rf $(DESTDIR)/$(man_dir)
 
-.PHONY: rc
-rc:
-ifeq ($(strip $(COUCH_RC)),)
-	@echo "COUCH_RC environment variable not set. Run as 'COUCH_RC=X make rc'"
-else
-	@rm -rf apache-couchdb-*
-	@$(MAKE) dist 2>&1 > /dev/null
-	@rm apache-couchdb-*.tar.gz
-	@mv apache-couchdb-* apache-couchdb-2.1.0-RC$(COUCH_RC)
-	@tar czf apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz apache-couchdb-2.1.0-RC$(COUCH_RC)
-	@echo "Done apache-couchdb-2.1.0-RC$(COUCH_RC).tar.gz"
-	@echo "Here is the list of commits since the last RC"
-	@git log --left-right --graph --cherry-pick --oneline 2.1.0-RC$(shell echo $(COUCH_RC)-1 | bc)...master
-	@echo "Done!"
-endif
 
 ################################################################################
 # Misc
diff --git a/rel/reltool.config b/rel/reltool.config
index 762848f2254..8bcf4c2ba53 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -12,7 +12,7 @@
 
 {sys, [
     {lib_dirs, ["../src"]},
-    {rel, "couchdb", "2.1.0", [
+    {rel, "couchdb", "2.1.1", [
         %% stdlib
         asn1,
         compiler,
diff --git a/version.mk b/version.mk
index 10a51517abd..a0b8bd1e35a 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 vsn_major=2
 vsn_minor=1
-vsn_patch=0
+vsn_patch=1