From 04001b8980443eea091d9e02282524e8fce6c361 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 29 2022 17:32:02 +0000 Subject: import ansible-pcp-2.2.2-2.el8 --- diff --git a/.ansible-pcp.metadata b/.ansible-pcp.metadata index f05d655..7de5eb1 100644 --- a/.ansible-pcp.metadata +++ b/.ansible-pcp.metadata @@ -1 +1 @@ -ab94928118391c9f2b15da234376b7775872d9d9 SOURCES/ansible-pcp-2.2.1.tar.gz +7921a5ebdf54799a87f23c9d6dc1854277475965 SOURCES/ansible-pcp-2.2.2.tar.gz diff --git a/.gitignore b/.gitignore index 277bb85..457b1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ansible-pcp-2.2.1.tar.gz +SOURCES/ansible-pcp-2.2.2.tar.gz diff --git a/SPECS/ansible-pcp.spec b/SPECS/ansible-pcp.spec index b563b88..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.1 -Release: 1%{?dist} +Version: 2.2.2 +Release: 2%{?dist} Summary: Ansible Metric collection for Performance Co-Pilot License: MIT -URL: %{ansible_collection_url} +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,13 @@ 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) + * Thu Aug 26 2021 Nathan Scott 2.2.1-1 - Latest upstream release