summaryrefslogtreecommitdiffstats
path: root/packaging/rpm/honeycomb.spec
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-03-28 09:15:42 +0200
committerJan Srnicek <jsrnicek@cisco.com>2017-03-29 06:11:23 +0000
commit212774e6dc3e3f74b100ac4f66420146e8f2472c (patch)
treeafc76d6ced7d91199066760e1d356bde6ceed3df /packaging/rpm/honeycomb.spec
parent539dafd91d6c58400ff2623d85df28f40a11ffe5 (diff)
HC2VPP-102: allow to configure vpp dependencies in deb/rpm build scripts
Debian: VPP dependencies can be specified in deb/common/vpp_dependencies file, used to generated debian/control file. Can be verified with: dpkg -I honeycomb_package.deb Centos: VPP dependencies can be specified in rpmvpp_dependencies file, referenced in honeycomb.spec. Can be verified with: rpm -i honeycomb_package.rpm Change-Id: Ide4ff3888085f714467fa1c1543b24b3c1b9f14b Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/rpm/honeycomb.spec')
-rw-r--r--packaging/rpm/honeycomb.spec3
1 files changed, 2 insertions, 1 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index 7047a340c..3c4e7efde 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 _vpp_dependencies %(./vpp_dependencies)
Name: honeycomb
Version: %{_version}
@@ -18,7 +19,7 @@ License: Apache-1.0
URL: http://www.fd.io
Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
Source1: honeycomb.service
-Requires: vpp >= 17.04, vpp < 17.08, vpp-plugins >= 17.04, vpp-plugins < 17.08, java >= 1:1.8.0
+Requires: %{_vpp_dependencies}, java >= 1:1.8.0
# Required for creating honeycomb group
Requires(pre): shadow-utils
# Required for configuring systemd