From 6673178d48bff38bd91a43ca4164f1c2c3de55db Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Mon, 5 Mar 2018 17:21:56 -0500 Subject: [PATCH] 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 --- Makefile | 3 ++- extras/rpm/vpp.spec | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f24c172459..5cc584998cf 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 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 += mbedtls-devel 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 d4c04835638..eb47b1b892e 100644 --- a/extras/rpm/vpp.spec +++ b/extras/rpm/vpp.spec @@ -50,13 +50,14 @@ 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 BuildRequires: mbedtls-devel %else %if 0%{?fedora} == 25 +BuildRequires: subunit, subunit-devel BuildRequires: openssl-devel BuildRequires: python-devel, python2-virtualenv BuildRequires: mbedtls-devel -- 2.16.6