summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Mikhailov (imichail) <imichail@cisco.com>2017-05-02 00:03:09 -0700
committerJohn Lo <loj@cisco.com>2017-05-04 01:19:15 +0000
commit342089672d7bbbd10066b725345b466d62846f19 (patch)
treeade31ac8f940c65316ffc69ea2562a51183d039e
parent816f437d943688f67d61fb6b9708eff59432b2ee (diff)
Fix RPM_DEPENDS for all rpm distros after 28ea251
Change-Id: I58ffdf75f361ff830c2b0c6400ccd012a4d16d3d Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f9a90d49084..55365b47751 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,11 @@ RPM_DEPENDS_GROUPS = 'Development Tools'
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
RPM_DEPENDS += python-devel
-ifeq ($(OS_ID)),fedora)
-ifeq ($(OS_VERSION_ID),25)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),fedora-25)
RPM_DEPENDS += python2-virtualenv
else
RPM_DEPENDS += python-virtualenv
endif
-endif
RPM_DEPENDS += lcov chrpath libffi-devel
RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros