From 8318ddd1cb9bd5e3708b027ca856c1886c7bffd3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 16 2022 04:19:47 +0000 Subject: import ansible-pcp-2.2.2-2.el8 --- diff --git a/SPECS/ansible-pcp.spec b/SPECS/ansible-pcp.spec index 26e9a16..a6a130b 100644 --- a/SPECS/ansible-pcp.spec +++ b/SPECS/ansible-pcp.spec @@ -1,4 +1,11 @@ -%if 0%{?rhel} +# NOTE: Even though ansible-core is in 8.6, it is only available +# at *runtime*, not at *buildtime* - so we can't have +# ansible-core as a build_dep on RHEL8 +%if 0%{?fedora} || 0%{?rhel} >= 9 +%bcond_without ansible +%global ansible_build_dep ansible-core >= 2.11.0 +%else +%if 0%{?rhel} && ! 0%{?epel} %global collection_namespace redhat %global collection_name rhel_metrics %bcond_with ansible @@ -6,18 +13,24 @@ %global collection_namespace performancecopilot %global collection_name metrics %bcond_without ansible +%global ansible_build_dep ansible >= 2.9.10 +%endif %endif Name: ansible-pcp Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ansible Metric collection for Performance Co-Pilot License: MIT URL: https://github.com/performancecopilot/ansible-pcp Source: https://github.com/performancecopilot/ansible-pcp/archive/v%{version}/%{name}-%{version}.tar.gz +%if 0%{?rhel} >= 8 +Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) +%endif + %if %{with ansible} -BuildRequires: ansible >= 2.9.10 +BuildRequires: %{ansible_build_dep} BuildRequires: python3-ansible-lint %endif BuildArch: noarch @@ -102,6 +115,9 @@ ansible-lint `find roles -name \*.yml` %{ansible_collection_files} %changelog +* Tue Feb 15 2022 Nathan Scott 2.2.2-2 +- RHEL8.6+, RHEL9+, Fedora - add "ansible-core or ansible" dep + * Fri Nov 12 2021 Nathan Scott 2.2.2-1 - Resolves Grafana provisioning issue (BZ 1967321) - Latest upstream release (BZ 2022168)