Fix RPM_DEPENDS for all rpm distros after 28ea251 47/6547/2
authorIgor Mikhailov (imichail) <imichail@cisco.com>
Tue, 2 May 2017 07:03:09 +0000 (00:03 -0700)
committerJohn Lo <loj@cisco.com>
Thu, 4 May 2017 01:19:15 +0000 (01:19 +0000)
Change-Id: I58ffdf75f361ff830c2b0c6400ccd012a4d16d3d
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
Makefile

index f9a90d4..55365b4 100644 (file)
--- 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