aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas F Herbert <therbert@redhat.com>2017-03-29 10:40:16 -0400
committerDamjan Marion <dmarion.lists@gmail.com>2017-03-29 21:48:22 +0000
commit28ea2515e55764cf3ffdb5334fece5836750edd1 (patch)
treed33e05b10bb3d92e06689a52b9c2f54bfb8c5f2d
parentb4874ee8d5a92017cb91ad23b0783385dd58253c (diff)
Fix for dependency problem with Fedora 25
Change-Id: I0e86f8eb6d62c6a109876b5bf35cc62ab617608e Signed-off-by: Thomas F Herbert <therbert@redhat.com>
-rw-r--r--Makefile12
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bdf20e89527..8964329b17b 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ endif
ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID))
PKG=deb
-else ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
+else ifeq ($(filter rhel centos fedora,$(OS_ID)),$(OS_ID))
PKG=rpm
endif
@@ -50,7 +50,15 @@ endif
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 python-virtualenv lcov chrpath libffi-devel
+RPM_DEPENDS += python-devel
+ifeq ($(OS_ID)),fedora)
+ifeq ($(OS_VERSION_ID),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