From e045ef401a64de28420465f27ff852730cd80257 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Wed, 21 Sep 2016 09:57:06 +0200
Subject: Bump version to 1.16.9 FINAL

Change-Id: I5dd38f7e9765fd3dded73b57358cdb1018232ad2
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 packaging/deb/debuild.sh     | 10 +++++-----
 packaging/rpm/honeycomb.spec |  6 +++---
 packaging/rpm/release        |  2 +-
 packaging/rpm/rpmbuild.sh    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'packaging')

diff --git a/packaging/deb/debuild.sh b/packaging/deb/debuild.sh
index 8da088d41..3327d1f10 100755
--- a/packaging/deb/debuild.sh
+++ b/packaging/deb/debuild.sh
@@ -8,9 +8,9 @@ PACKAGING_ROOT=${DIR}/honeycomb-${VERSION}
 
 # Copy and unpack the archive with vpp-integration distribution
 ARCHIVE_DIR=${DIR}/../../vpp-integration/minimal-distribution/target/
-ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.16.9-SNAPSHOT-hc.tar.gz
+ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz
 cp ${ARCHIVE} ${DIR}
-ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
+ARCHIVE=${DIR}/vpp-integration-distribution-${VERSION}-hc.tar.gz
 tar -xf ${ARCHIVE} -C ${DIR}/
 
 # Create packaging root
@@ -18,7 +18,7 @@ rm -rf ${PACKAGING_ROOT}
 mkdir ${PACKAGING_ROOT}
 
 # Copy contents of tar.gz
-mv ${DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${PACKAGING_ROOT}/
+mv ${DIR}/vpp-integration-distribution-${VERSION}/ ${PACKAGING_ROOT}/
 cp -r ${DIR}/debian/ ${PACKAGING_ROOT}
 
 # Upstart configuration
@@ -28,14 +28,14 @@ cp ${DIR}/honeycomb.conf ${PACKAGING_ROOT}
 cat <<EOT >> ${PACKAGING_ROOT}/debian/changelog
 honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low
 
-  * Initial release
+  * Formal 1609 release
 
  -- mmarsale <mmarsale@cisco.com>  Mon, 22 Aug 2016 09:41:37 +0200
 EOT
 
 # Install instructions
 cat <<EOT >> ${PACKAGING_ROOT}/debian/install
-vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
+vpp-integration-distribution-${VERSION}/* /opt/honeycomb/
 honeycomb.conf /etc/init/
 EOT
 
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index f15d7e133..e14f65095 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -16,7 +16,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}-hc.zip
 Source1:     honeycomb.service
 Requires:    vpp, java >= 1:1.8.0
 # Required for creating honeycomb group
@@ -37,13 +37,13 @@ fd.io Honeycomb
 
 %prep
 # Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
+%autosetup -n vpp-integration-distribution-%{_version}
 
 %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}/* $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 c4bf723b5..8720190bb 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,2 +1,2 @@
 #!/bin/bash
-echo $BUILD_NUMBER
+echo FINAL
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index dc28cddd0..01a174d99 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.16.9-SNAPSHOT-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.16.9-hc.zip
 mkdir -p ${DIR}/SOURCES/
 cp $ZIPFILE ${DIR}/SOURCES/
 cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
-- 
cgit 1.2.3-korg