HC2VPP-194: fix package ordering

1.17.10-2000 precedes 1.17.10-RCX~2000 according to dpkg:

dpkg --compare-versions 1.17.10-2000 lt 1.17.10-RCX~2000 && echo true

Therefore, after releasing non snapshot version,
we should update package version of honeycomb snapshots.

This is a squash of
https://gerrit.fd.io/r/#/c/7620/
and
https://gerrit.fd.io/r/#/c/7783/
which solved similar issue for 1.17.07.

Change-Id: I0b08f671d41152d03c567b9d4a350e5b0aafa9d2
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/packaging/rpm/release b/packaging/rpm/release
index 4de82e4..2587922 100755 (executable)
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -7,4 +7,7 @@
 # Increasing the build number by a certain margin.
 # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset
 # rewriting older packages
-echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file
+# $(expr $BUILD_NUMBER + 2000)
+# echo RC1~$(expr $BUILD_NUMBER + 2000)
+echo RC2~$(expr $BUILD_NUMBER + 2000)
+# echo RELEASE~$(expr $BUILD_NUMBER + 2000)
\ No newline at end of file