.ansible-pcp.metadata

@@ -1 +1 @@
-3d59038ddce9900044249a9fd31aa7a606dcb224 SOURCES/ansible-pcp-2.2.7.tar.gz
+d8813fc9c3ee048a2a7f69c7e4aed8012adb9802 SOURCES/ansible-pcp-2.3.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/ansible-pcp-2.2.7.tar.gz
+SOURCES/ansible-pcp-2.3.0.tar.gz

SPECS/ansible-pcp.spec

@@ -1,54 +1,36 @@
 Name:             ansible-pcp
-Version:          2.2.7
-Release:          1%{?dist}
+Version:          2.3.0
+Release:          5%{?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}
+%if %{defined rhel}
 %global collection_namespace redhat
 %global collection_name rhel_metrics
+%global ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}
 %else
 %global collection_namespace performancecopilot
 %global collection_name metrics
 %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 latest RHEL versions.
-%if 0%{?fedora}
-%bcond_without ansible
-%global ansible_build_dep ansible-core >= 2.11.0
-%else
-%if 0%{?rhel} && ! 0%{?epel}
-%bcond_with ansible
-%else
-%bcond_without ansible
-%global ansible_build_dep ansible >= 2.9.10
-%endif
-%endif
-
 %if 0%{?rhel} >= 8
 Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %endif
 
-%if %{with ansible}
-BuildRequires:    %{ansible_build_dep}
+%if 0%{?rhel} >= 9
+BuildRequires:  ansible-core
+%global ansible_collection_build ansible-galaxy collection build .
+%global ansible_collection_install ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
 %endif
 
-%{!?ansible_collection_files:%define ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/}
-
-# package has been removed from RHEL8
-%if 0%{?rhel} >= 8
-%bcond_with ansible_lint
-%else
-%bcond_without ansible_lint
-%endif
-
-%if %{with ansible_lint}
-BuildRequires:    python3-ansible-lint
+%if %{defined fedora}
+BuildRequires:  ansible-packaging
+BuildRequires:  ansible-packaging-tests
+# There's ansible-lint errors that need to be addressed
+# BuildRequires: python3-ansible-lint
 %endif
 
 %description
@@ -87,13 +69,10 @@ values (and metadata) to ElasticSearch for the indexing and querying
 of performance data.
 
 %prep
-%autosetup
-mv .yamllint.yml yamllint.yml
-mv .yamllint_defaults.yml yamllint_defaults.yml
+%autosetup -p1
 %if 0%{?rhel}
 rm -vr roles/repository tests/*repository* tests/*/*repository* docs/repository
 %endif
-rm -vr .github .gitignore .ansible-lint .*.yml
 sed -i \
     -e 's/^name: .*/name: %{collection_name}/g' \
     -e 's/^namespace: .*/namespace: %{collection_namespace}/g' \
@@ -105,25 +84,28 @@ find . -name \*.yml -o -name \*.md | while read file; do
 done
 
 %build
-%if %{with ansible}
-%ansible_collection_build
-%else
+# 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 %{defined rhel} && 0%{?rhel} <= 8
 tar -cf %{_tmppath}/%{collection_namespace}-%{collection_name}-%{version}.tar.gz .
+%else
+%ansible_collection_build
 %endif
 
 %install
-%if %{with ansible}
-%ansible_collection_install
-%else
+%if %{defined rhel} && 0%{?rhel} <= 8
 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
+%else
+%ansible_collection_install
 %endif
 
 %check
-mv yamllint.yml .yamllint.yml
-mv yamllint_defaults.yml .yamllint_defaults.yml
-%if %{with ansible_lint}
+# There's outstanding ansible-lint failures that need to be addressed.
+# %%if %%{defined fedora}
+%if 0
 ansible-lint `find roles -name \*.yml`
 %endif
 
@@ -133,34 +115,75 @@ ansible-lint `find roles -name \*.yml`
 %{ansible_collection_files}
 
 %changelog
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.3.0-5
+- Bump release for June 2024 mass rebuild
+
+* Wed Jun 19 2024 Nathan Scott <nathans@redhat.com> 2.3.0-4
+- Rebuild for c10s.
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Nov 28 2023 Nathan Scott <nathans@redhat.com> 2.3.0-1
+- Latest upstream release
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Nathan Scott <nathans@redhat.com> 2.2.9-1
+- Latest upstream release
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Nov 28 2022 Nathan Scott <nathans@redhat.com> 2.2.8-1
+- Latest upstream release
+
+* Sat Nov 19 2022 Maxwell G <gotmax@e.email> - 2.2.7-2
+- BuildRequire ansible-packaging on Fedora
+- Resolves: rhbz#2126889
+- Fix inverted conditionals and build/install the collection using ansible-galaxy
+- Keep ansible-lint disabled for now
+- Remove unnecessary macros
+- Exclude files with galaxy.yml build_ignore
+
 * Fri Oct 28 2022 Nathan Scott <nathans@redhat.com> 2.2.7-1
-- Latest upstream release (BZ 2132847)
+- Latest upstream release
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
 * Thu Apr 21 2022 Nathan Scott <nathans@redhat.com> 2.2.5-1
-- Switch to using bcond spec file mechanisms
-- Latest upstream release (BZ 2059464)
+- Latest upstream release
 
-* Tue Feb 15 2022 Nathan Scott <nathans@redhat.com> 2.2.2-2
+* Tue Feb 15 2022 Nathan Scott <nathans@redhat.com> 2.2.4-3
 - RHEL8.6+, RHEL9+, Fedora - add "ansible-core or ansible" dep
 
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Dec 17 2021 Nathan Scott <nathans@redhat.com> 2.2.4-1
+- Small fixes for bpftrace, mssql roles and tests
+- RHEL9 - add "Requires: ansible-core"
+- Latest upstream release
+
 * Fri Nov 12 2021 Nathan Scott <nathans@redhat.com> 2.2.2-1
-- Resolves Grafana provisioning issue (BZ 1967321)
-- Latest upstream release (BZ 2022168)
+- Correct the URL listed for this package (BZ 2001902)
+- Latest upstream release
 
 * Thu Aug 26 2021 Nathan Scott <nathans@redhat.com> 2.2.1-1
 - Latest upstream release
 
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Jun 25 2021 Nathan Scott <nathans@redhat.com> 2.1.4-1
 - Latest upstream release
 
-* Tue Jun 08 2021 Nathan Scott <nathans@redhat.com> 2.1.3-3
-- Rebuild for full pass through CI/gating processes
-
-* Mon Jun 07 2021 Nathan Scott <nathans@redhat.com> 2.1.3-2
-- Drop unnecessary package dependency on Ansible
-
 * Thu Jun 03 2021 Nathan Scott <nathans@redhat.com> 2.1.3-1
-- Initial version of RHEL package (BZ 1854055)
 - Latest upstream release
 
 * Fri Feb 05 2021 Nathan Scott <nathans@redhat.com> 2.1.2-1