From 7a10cb6bb7c8ac100226adfc0448f522387da27a Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@oath.com>
Date: Tue, 28 Aug 2018 10:38:45 +0200
Subject: Set version number when building Vespa RPM. Bump minor number in
 VERSION file upon release.

---
 dist.sh                   | 2 +-
 dist/release-vespa-rpm.sh | 5 +++++
 dist/vespa.spec           | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dist.sh b/dist.sh
index c1fd499fdf9..ae4cce08a99 100755
--- a/dist.sh
+++ b/dist.sh
@@ -10,4 +10,4 @@ VERSION="$1"
 
 mkdir -p ~/rpmbuild/{SOURCES,SPECS}
 GZIP=-1 tar -zcf ~/rpmbuild/SOURCES/vespa-$VERSION.tar.gz --exclude target --exclude cmake-build-debug --transform "flags=r;s,^,vespa-$VERSION/," *
-sed -e "s,VESPA_VERSION,$VERSION,"  < dist/vespa.spec > ~/rpmbuild/SPECS/vespa-$VERSION.spec
+sed -e "s,_VESPA_VERSION_,$VERSION,"  < dist/vespa.spec > ~/rpmbuild/SPECS/vespa-$VERSION.spec
diff --git a/dist/release-vespa-rpm.sh b/dist/release-vespa-rpm.sh
index c21550215f0..d2384c21b4e 100755
--- a/dist/release-vespa-rpm.sh
+++ b/dist/release-vespa-rpm.sh
@@ -19,6 +19,11 @@ readonly CURRENT_BRANCH=$(git branch | grep "^\*" | cut -d' ' -f2)
 git checkout master
 git pull --rebase
 
+# Update the VERSION file on master to be the next releasable version
+echo "$VERSION" | awk -F. '{print $1"."($2+1)".0"}' > VERSION
+git commit -am "Updating VERSION file to next releasable minor version."
+git push
+
 # Delete existing branch if exists and create new one
 git push --delete origin $RPM_BRANCH &> /dev/null || true
 git branch -D $RPM_BRANCH &> /dev/null || true 
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 1a0a51b88fc..25ee24167f8 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -7,7 +7,7 @@
 %define _prefix /opt/vespa
 
 Name:           vespa
-Version:        VESPA_VERSION
+Version:        _VESPA_VERSION_
 Release:        1%{?dist}
 Summary:        Vespa - The open big data serving engine
 Group:          Applications/Databases
@@ -145,6 +145,7 @@ source %{_devtoolset_enable} || true
 %if 0%{?_rhmaven35_enable:1}
 source %{_rhmaven35_enable} || true
 %endif
+export FACTORY_VESPA_VERSION=%{version}
 sh bootstrap.sh java
 mvn --batch-mode -nsu -T 1  install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
 cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-- 
cgit v1.2.3