summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <therbert@redhat.com>2017-10-09 15:03:55 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-10-14 09:12:12 +0000
commite41289115ffb24d95a5d0bc2ef33001d06a28688 (patch)
treedfa85dea46d0a3084b23cb571e9a9b2a7791fa97
parent75d856096f644837e0da9fda011f0c419fa9414e (diff)
Deps added to Makefile must also be in spec file.
Deps are required for Fedora too. This patch is merged in version stable/17.10. It should also be merged in master because it fixes breaking rpm builds in some circumstances. JIRA: VPP-1015 Cherry-picked from stable/1710 Change-Id: I10807069742cdd6b09a0f34d9d05e9cae4146ec3 Signed-off-by: Thomas F Herbert <therbert@redhat.com>
-rw-r--r--Makefile8
-rw-r--r--extras/rpm/vpp.spec4
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c43612de234..cc9dc0e479e 100644
--- a/Makefile
+++ b/Makefile
@@ -87,18 +87,16 @@ endif
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += apr-devel
RPM_DEPENDS += numactl-devel
-RPM_DEPENDS += check
-
-ifeq ($(filter centos,$(OS_ID)),$(OS_ID))
- RPM_DEPENDS += check-devel subunit subunit-devel
-endif
+RPM_DEPENDS += check check-devel
ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
+ RPM_DEPENDS += subunit subunit-devel
RPM_DEPENDS += openssl-devel
RPM_DEPENDS += python-devel
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
RPM_DEPENDS += python2-virtualenv
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 501297b3651..328475500f9 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -31,6 +31,10 @@ Version: %{_version}
Release: %{_release}
Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils, python
BuildRequires: systemd, chrpath
+BuildRequires: check, check-devel
+%if 0%{?fedora} >= 25
+BuildRequires: subunit, subunit-devel
+%endif
%if 0%{?fedora} >= 26
BuildRequires: compat-openssl10-devel
BuildRequires: python2-devel, python2-virtualenv