From 61ce45d0b1526ba0326f8bf25e903b0919be33e0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 01 2022 12:04:49 +0000 Subject: import ansible-pcp-2.2.2-2.el9 --- diff --git a/SPECS/ansible-pcp.spec b/SPECS/ansible-pcp.spec index fe956cb..bf6fcf2 100644 --- a/SPECS/ansible-pcp.spec +++ b/SPECS/ansible-pcp.spec @@ -1,26 +1,55 @@ +Name: ansible-pcp +Version: 2.2.2 +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 +BuildArch: noarch + %if 0%{?rhel} %global collection_namespace redhat %global collection_name rhel_metrics -%bcond_with ansible %else %global collection_namespace performancecopilot %global collection_name metrics -%bcond_without ansible %endif -Name: ansible-pcp -Version: 2.2.2 -Release: 1%{?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 + +# 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 +%global have_ansible 0 +%global ansible_build_dep ansible-core >= 2.11.0 +%else +%if 0%{?rhel} && ! 0%{?epel} +%global have_ansible 1 +%else +%global have_ansible 0 +%global ansible_build_dep ansible >= 2.9.10 +%endif +%endif -%if %{with ansible} -BuildRequires: ansible >= 2.9.10 +%if %{have_ansible} +BuildRequires: %{ansible_build_dep} +# package has been removed from RHEL9 +%if 0%{?rhel} >= 9 +%global have_ansible_lint 0 +%else +%global have_ansible_lint 1 +%endif +%else +%global have_ansible_lint 0 +%global ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace} +%endif + +%if %{have_ansible_lint} BuildRequires: python3-ansible-lint %endif -BuildArch: noarch %description A collection containing roles for Performance Co-Pilot (PCP) and related @@ -75,24 +104,26 @@ find . -name \*.yml -o -name \*.md | while read file; do $file done -%if %{without ansible} -%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace} -# Empty command. We don't have ansible-galaxy. -%define ansible_collection_build() tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz . -# Simply copy everything instead of galaxy-installing the built artifact. -%define ansible_collection_install() mkdir -p %{buildroot}%{ansible_collection_files}/%{collection_name}; (cd %{buildroot}%{ansible_collection_files}/%{collection_name}; tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz) -%endif - %build +%if %{have_ansible} %ansible_collection_build +%else +tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz . +%endif %install +%if %{have_ansible} %ansible_collection_install +%else +mkdir -p %{buildroot}%{ansible_collection_files}/%{collection_name} +cd %{buildroot}%{ansible_collection_files}/%{collection_name} +tar -xf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz +%endif %check mv yamllint.yml .yamllint.yml mv yamllint_defaults.yml .yamllint_defaults.yml -%if %{with ansible} +%if %{have_ansible_lint} ansible-lint `find roles -name \*.yml` %endif @@ -102,22 +133,27 @@ 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 2022170) +- Latest upstream release (BZ 2022168) -* Mon Aug 30 2021 Nathan Scott 2.2.1-1 +* Thu Aug 26 2021 Nathan Scott 2.2.1-1 - Latest upstream release -* Mon Aug 09 2021 Mohan Boddu - 2.1.4-2 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - * Fri Jun 25 2021 Nathan Scott 2.1.4-1 - Latest upstream release -* Wed Jun 09 2021 Nathan Scott 2.1.3-1 -- Initial version of RHEL-9 package (BZ 1957566) +* Tue Jun 08 2021 Nathan Scott 2.1.3-3 +- Rebuild for full pass through CI/gating processes + +* Mon Jun 07 2021 Nathan Scott 2.1.3-2 +- Drop unnecessary package dependency on Ansible + +* Thu Jun 03 2021 Nathan Scott 2.1.3-1 +- Initial version of RHEL package (BZ 1854055) - Latest upstream release * Fri Feb 05 2021 Nathan Scott 2.1.2-1