From 221f558101ae0a421e621947d62c2199c6cfa5ff Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Fri, 31 Mar 2017 13:05:52 +0200
Subject: Bump hc2vpp version to 1.17.04-RC1

Also updates honeycomb dependencies and vpp package dependencies

Change-Id: I4527d86b4ebf6e8e8a92c8d62c5a14640802b3e7
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 packaging/rpm/honeycomb.spec   | 6 +++---
 packaging/rpm/release          | 4 ++--
 packaging/rpm/rpmbuild.sh      | 2 +-
 packaging/rpm/vpp_dependencies | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packaging/rpm')

diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index 3c4e7efde..bb90aad0b 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -17,7 +17,7 @@ Summary:    fd.io Honeycomb
 Group:      Applications/Communications
 License:    Apache-1.0
 URL:        http://www.fd.io
-Source0:     vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
+Source0:     vpp-integration-distribution-%{_version}-RC1-hc.zip
 Source1:     honeycomb.service
 Requires:    %{_vpp_dependencies}, java >= 1:1.8.0
 # Required for creating honeycomb group
@@ -38,13 +38,13 @@ fd.io Honeycomb
 
 %prep
 # Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
+%autosetup -n vpp-integration-distribution-%{_version}-RC1
 
 %install
 # Create directory in build root for Honeycomb
 mkdir -p $RPM_BUILD_ROOT/opt/%name
 # Copy Honeycomb from archive to its dir in build root
-cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name
+cp -r ../vpp-integration-distribution-%{_version}-RC1/* $RPM_BUILD_ROOT/opt/%name
 # Create directory in build root for systemd .service file
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 # Copy Honeycomb's systemd .service file to correct dir in build root
diff --git a/packaging/rpm/release b/packaging/rpm/release
index 4de82e41c..94011ea03 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
 #!/bin/bash
 # release version
-# echo RELEASE
+echo RC1
 #
 # snapshot version
 #
 # 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
+# echo $(expr $BUILD_NUMBER + 2000)
\ No newline at end of file
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index b50beb436..e1a831470 100755
--- a/packaging/rpm/rpmbuild.sh
+++ b/packaging/rpm/rpmbuild.sh
@@ -3,7 +3,7 @@ set -xe
 DIR=$(dirname $0)
 DIR=$(readlink -f $DIR)
 ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/
-ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-SNAPSHOT-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.04-RC1-hc.zip
 mkdir -p ${DIR}/SOURCES/
 cp $ZIPFILE ${DIR}/SOURCES/
 cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index 5090544b6..485014859 100755
--- a/packaging/rpm/vpp_dependencies
+++ b/packaging/rpm/vpp_dependencies
@@ -1,6 +1,6 @@
 #!/bin/bash
 # defines vpp and vpp-plugins dependencies for rpm packages
 # using range
-echo "vpp >= 17.04, vpp < 17.07, vpp-plugins >= 17.04, vpp-plugins < 17.07"
+echo "vpp >= 17.04-rc1, vpp < 17.05, vpp-plugins >= 17.04-rc1, vpp-plugins < 17.05"
 # or specific vpp version
 #echo "vpp = 17.04-rc1, vpp-plugins = 17.04-rc1"
-- 
cgit 1.2.3-korg