diff options
author | Maros Marsalek <mmarsale@cisco.com> | 2016-09-15 10:12:39 +0200 |
---|---|---|
committer | Maros Marsalek <mmarsale@cisco.com> | 2016-09-15 10:18:28 +0200 |
commit | 9572e2714d1f4a2b0f75a98b63316705f8fa046d (patch) | |
tree | 9ef3d6864fbeae9a64297cf826a4e0b486e20a40 /packaging/rpm | |
parent | a5846cd36101fba5acdf511480fdbdf2f17f039a (diff) |
Bump versions to SNAPSHOT
This reverts commit a5846cd36101fba5acdf511480fdbdf2f17f039a.
Change-Id: Ie02435307b2ab6e4627758ff6ab0071de4966339
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r-- | packaging/rpm/honeycomb.spec | 6 | ||||
-rwxr-xr-x | packaging/rpm/release | 2 | ||||
-rwxr-xr-x | packaging/rpm/rpmbuild.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 35195f170..f15d7e133 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}-RC2-hc.zip +Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-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}-RC2 +%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT %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}-RC2/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $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 a35258fed..c4bf723b5 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,2 +1,2 @@ #!/bin/bash -echo RC2 +echo $BUILD_NUMBER diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 38c2a44e4..dc28cddd0 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-RC2-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.16.9-SNAPSHOT-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ |