Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CentOS-Stream-8/9 dependency fixes - backport to b0.71 #2896

Merged
merged 2 commits into from
Jun 16, 2022
Merged

CentOS-Stream-8/9 dependency fixes - backport to b0.71 #2896

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
201c612
CentOS-Stream-8/9 dependency fixes - backport to b0.71
ndokos Jun 13, 2022
2e44e4b
Fixes from review comments
ndokos Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions agent/rpm/pbench-agent.spec.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,22 @@ URL: https://github.com/distributed-system-analysis/pbench
Source0: pbench-agent-%{version}.tar.gz
Buildarch: noarch

%if 0%{?rhel} < 9
Requires: ansible
%else
# EPEL provides ansible (a curated set of roles with a dependency on ansible-core)
# on RHEL 8 and RHEL9. Only CentOS-Stream seems to not have an ansible package
# available.

%if 0%{?centos} >= 8
Requires: ansible-core
%else
Requires: ansible
%endif

%if 0%{?rhel} == 7

%if 0%{?rhel} == 7
webbnh marked this conversation as resolved.
Show resolved Hide resolved
Requires: python3, python3-pip
%endif

# this applies to CentOS-Stream-8 as well
%if 0%{?rhel} == 8
Requires: python36, python3-pip
webbnh marked this conversation as resolved.
Show resolved Hide resolved
# RPMs for modules in requirements.txt
Expand All @@ -26,6 +32,7 @@ Requires: python3-cffi, python3-click, python3-requests
Requires: python3-docutils, python3-psutil
%endif

# this applies to CentOS-Stream-9 as well
%if 0%{?rhel} == 9
Requires: python3-pip
# RPMs for modules in requirements.txt
Expand All @@ -34,6 +41,7 @@ Requires: python3-cffi, python3-requests
Requires: python3-docutils, python3-psutil
%endif


webbnh marked this conversation as resolved.
Show resolved Hide resolved
%if 0%{?fedora} != 0
Requires: python3, python3-pip
# RPMs for modules in requirements.txt
Expand Down