summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <therbert@redhat.com>2018-03-05 17:21:56 -0500
committerThomas F Herbert <therbert@redhat.com>2018-04-07 17:14:45 +0000
commitca3c508401df844807f2e7646c545c049c0cbb3b (patch)
treebb7d1e845344578395ef44d019cd15b08885dacd
parent7ace56b9d8289e09db5d8821628a9e8e063b0ab1 (diff)
Remove subunit from Centos requirements.
JIRA: VPP-1229 Subunit and Subunit-devel in Fedora and Epel but not Centos. This patch moves the Fedora from the Centos specific requirements. Change-Id: I093a4571cddf14af5ee2827ba8ee00c7bcbe6fc0 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
-rw-r--r--Makefile3
-rw-r--r--extras/rpm/vpp.spec3
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 6dd2fc2e3fe..5de9f8e9632 100644
--- a/Makefile
+++ b/Makefile
@@ -84,16 +84,17 @@ RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
RPM_DEPENDS += check check-devel
RPM_DEPENDS += boost boost-devel
-RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += selinux-policy selinux-policy-devel
RPM_DEPENDS += mbedtls-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+ RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel python2-ply
RPM_DEPENDS += python2-virtualenv
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
else ifeq ($(shell if [ "$(OS_ID)" = "fedora" ]; then test $(OS_VERSION_ID) -gt 25; echo $$?; fi),0)
+ RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += compat-openssl10-devel
RPM_DEPENDS += python2-devel python2-ply
RPM_DEPENDS += python2-virtualenv
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index fe4f3d83999..e2caa986fac 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -50,12 +50,13 @@ Release: %{_release}
Requires: vpp-lib = %{_version}-%{_release}, vpp-selinux-policy = %{_version}-%{_release}, net-tools, pciutils, python
BuildRequires: systemd, chrpath
BuildRequires: check, check-devel
-BuildRequires: subunit, subunit-devel
%if 0%{?fedora} >= 26
+BuildRequires: subunit, subunit-devel
BuildRequires: compat-openssl10-devel
BuildRequires: python2-devel, python2-virtualenv
%else
%if 0%{?fedora} == 25
+BuildRequires: subunit, subunit-devel
BuildRequires: openssl-devel
BuildRequires: python-devel, python2-virtualenv
%else