From dc33941efe17bfaefa0fa4664d3b6877f6fe4256 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 29 May 2025 13:27:57 -0600 Subject: [PATCH] system roles 1.100.1-1.1 Resolves: RHEL-94444 : ansible-core and rhel-system-roles incompatible (cherry picked from commit 1f11ced3b02df394c9d4a9295dd896fe8d184f1c) --- CHANGELOG.md | 3 ++- linux-system-roles.spec | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d4ea7d..bb13a17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Changelog ========= -[1.100.1] - 2025-05-20 +[1.100.1] - 2025-05-29 ---------------------------- ### New Features @@ -15,6 +15,7 @@ Changelog ### Bug Fixes - [docs links should not use rhel-system-roles.github](https://issues.redhat.com/browse/RHEL-85569) +- [ansible-core and rhel-system-roles incompatible](https://issues.redhat.com/browse/RHEL-94444) - [ad_integration - Introduced option to skip package installation [rhel-9]](https://issues.redhat.com/browse/RHEL-88314) - [ha_cluster - fix: restart qdevice when its certificates have been regenerated [rhel-9]](https://issues.redhat.com/browse/RHEL-88251) - [ha_cluster - ha_cluster: 404 on removing qnetd certificate on rhel9.4 client vm [rhel-9]](https://issues.redhat.com/browse/RHEL-88241) diff --git a/linux-system-roles.spec b/linux-system-roles.spec index c744664..46ad1ea 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -24,7 +24,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management Version: 1.100.1 -Release: 0.1%{?dist} +Release: 1.1%{?dist} License: GPLv3+ and MIT and BSD and Python %global _pkglicensedir %{_licensedir}/%{name} @@ -426,6 +426,10 @@ fi # we vendor-in all of the dependencies on rhel, so remove them rm -f lsr_role2collection/collection_requirements.txt # but leave bindep.txt +# rhel 9 requires 2.14.0 - see https://issues.redhat.com/browse/RHEL-94046 +%if 0%{?rhel} == 9 +sed 's/^requires_ansible:.*/requires_ansible: ">=2.14.0"/' -i lsr_role2collection/runtime.yml +%endif %else ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ "Linux System Roles Ansible Collection" \ @@ -691,6 +695,9 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \ %endif %changelog +* Thu May 29 2025 Rich Megginson - 1.100.1-1.1 +- Resolves: RHEL-94444 : ansible-core and rhel-system-roles incompatible + * Tue May 20 2025 Rich Megginson - 1.100.1-0.1 - Resolves: RHEL-61488 : snapshot - add snapshot-manager provider