diff options
| author | Simon Nagl <sin6332@thi.de> | 2017-02-11 13:53:05 +0100 |
|---|---|---|
| committer | Simon Nagl <sin6332@thi.de> | 2017-02-11 13:53:05 +0100 |
| commit | b5637bdf504d9f43b43b0495b80a0dc48b98122f (patch) | |
| tree | 5f70660d70088fb5d5427f91bd6d49faca88fc9d | |
| parent | 541ed96c3a6bff68f9f4a87c4a68db8cc4517599 (diff) | |
Switch _prerelease to _rolling
| -rw-r--r-- | configure.ac | 6 | ||||
| -rwxr-xr-x | packaging/update-tags | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ad71b6a86a..20a74696ba 100644 --- a/configure.ac +++ b/configure.ac @@ -7,15 +7,15 @@ define([VERSION_MAJOR], [1]) define([VERSION_MINOR], [5]) define([VERSION_FIX], [1]) define([VERSION_NUMBER], VERSION_MAJOR[.]VERSION_MINOR[.]VERSION_FIX) -define([VERSION_SUFFIX], [_prerelease]) +define([VERSION_SUFFIX], [_rolling]) dnl Set to "1" for a first RPM release of a new version PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed s/^_//)" define([VERSION_STRING], m4_esyscmd_s(git describe 2>/dev/null | sed 's/^v//')) -m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER[]VERSION_SUFFIX)]) +m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_NUMBER)]) -AC_INIT([netdata], VERSION_STRING) +AC_INIT([netdata], VERSION_STRING[]VERSION_SUFFIX) AM_MAINTAINER_MODE([disable]) if test x"$USE_MAINTAINER_MODE" = xyes; then diff --git a/packaging/update-tags b/packaging/update-tags index 519934850f..f2d641b3b9 100755 --- a/packaging/update-tags +++ b/packaging/update-tags @@ -135,7 +135,7 @@ then fi echo "Resetting suffix in configure.ac:" - sed -i -e 's/define(\[VERSION_SUFFIX\], \[.*])/define([VERSION_SUFFIX], [_prerelease])/' configure.ac + sed -i -e 's/define(\[VERSION_SUFFIX\], \[.*])/define([VERSION_SUFFIX], [_rolling])/' configure.ac sed -i -e 's:^PACKAGE_RPM_RELEASE=.*:PACKAGE_RPM_RELEASE="0.0.$(echo VERSION_SUFFIX | sed s/^_//)":' configure.ac echo "Committing new configure.ac:" |