From f3f607265e78848a733001df64a46ae39fa5b668 Mon Sep 17 00:00:00 2001 From: Martin Juhl Date: Jan 17 2017 10:05:55 +0000 Subject: Fixes for building COPR Backend and Dist-git on EL7 --- diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec index 9c1f7f1..31cfaab 100644 --- a/backend/copr-backend.spec +++ b/backend/copr-backend.spec @@ -93,7 +93,10 @@ Requires: python-paramiko Requires: python-lockfile Requires: python2-modulemd # Requires: python-ipdb +# EL7 doesn't support "Suggests" +%if 0%{?fedora} Suggests: logstash +%endif Requires: libappstream-glib-builder >= 0.4.0 # Requires: python-plumbum Requires: rpm-sign diff --git a/dist-git/copr-dist-git.spec b/dist-git/copr-dist-git.spec index f58c4d2..ffe4920 100644 --- a/dist-git/copr-dist-git.spec +++ b/dist-git/copr-dist-git.spec @@ -26,7 +26,11 @@ BuildRequires: python-dateutil BuildRequires: pytest BuildRequires: python-pytest-cov BuildRequires: python-mock +%if 0%{?el7} +BuildRequires: python-psutil +%else BuildRequires: python2-psutil +%endif BuildRequires: pytz %if 0%{?fedora} > 23 @@ -42,7 +46,11 @@ Requires: systemd Requires: dist-git Requires: python-bunch Requires: python-requests +%if 0%{?el7} +Requires: python-psutil +%else Requires: python2-psutil +%endif Requires: python-jinja2 Requires: pyrpkg Requires: mock-scm