summaryrefslogtreecommitdiffstats
path: root/packaging/rpm/honeycomb.spec
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-01-10 10:51:11 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-01-11 08:01:53 +0100
commit3dd06d40b35c5fc3a9e04a7314daf163647b0192 (patch)
treec151b2de1d2dbd67e62c341a2836acbb9a909377 /packaging/rpm/honeycomb.spec
parent0651fbe5d97b7eab72a0970fa4158c8019749dd7 (diff)
Introduce hc2vpp_version
Hc2vpp jar versioning is currently slightly different than honeycomb DEB/RPM versioning. This patch introduces hc2vpp_version to reflect that difference and simplify release process. In the future unification of versioning scheme should be considered. Change-Id: I6b6f3c39a7bee9de86163b107f5e6ba941c839ee Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/rpm/honeycomb.spec')
-rw-r--r--packaging/rpm/honeycomb.spec7
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index 3c4e7efde..6ec63e1e6 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -2,6 +2,7 @@
%define __jar_repack 0
%define _version %(./version)
%define _release %(./release)
+%define _hc2vpp_version %(./hc2vpp_version)
%define _vpp_dependencies %(./vpp_dependencies)
Name: honeycomb
@@ -17,7 +18,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-%{_hc2vpp_version}-hc.zip
Source1: honeycomb.service
Requires: %{_vpp_dependencies}, java >= 1:1.8.0
# Required for creating honeycomb group
@@ -38,13 +39,13 @@ fd.io Honeycomb
%prep
# Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
+%autosetup -n vpp-integration-distribution-%{_hc2vpp_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-%{_hc2vpp_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