diff options
| author |   Thomas F Herbert <therbert@redhat.com> | 2017-10-09 15:03:55 -0400 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-10-11 07:58:10 +0000 |
| commit | dfa0d20405a18a1a8f4fd0c8266b9c3dc63c3e2e (patch) | |
| tree | dcf17efc2f1a7afa35eb9784d2375fcedc22f81b | |
| parent | 8c5bfbcc09f44f3ed2b87b0b5c257fbb7b735f97 (diff) | |
Deps added to Makefile must also be in spec file.
Deps are required for Fedora too.
This patch should be in version 17.10 because it
fixes breaking rpm builds in some circumstances.
JIRA: VPP-1015
Change-Id: I10807069742cdd6b09a0f34d9d05e9cae4146ec3
Signed-off-by: Thomas F Herbert <therbert@redhat.com>
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | extras/rpm/vpp.spec | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -81,13 +81,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 +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 d611ac5c..7490a165 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 |