From 6a51ef1ecccdc098365910fc004da4305b4d4a0a Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 3 Feb 2022 13:34:38 -0700 Subject: [PATCH] RHEL8.6, 9 - add "Requires: ansible-core or ansible" RHEL8.6, 9 - add "Requires: ansible-core or ansible" Resolves: rhbz#2012298 (EL9) --- linux-system-roles.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 9d0b47d..da6ab7a 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -31,7 +31,7 @@ Name: linux-system-roles Url: https://github.com/linux-system-roles Summary: Set of interfaces for unified system management Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} #Group: Development/Libraries License: GPLv3+ and MIT and BSD and Python @@ -72,6 +72,16 @@ License: GPLv3+ and MIT and BSD and Python %endif %endif +# ansible-core is in rhel 8.6 and later - default to ansible-core, but allow +# the use of ansible if present - we may revisit this if the automatic dependency +# generator is added to ansible-core in RHEL +# Fedora - the automatic generator will add this - no need to explicit declare +# it in the spec file +# EL7 - no dependency on ansible because there is no ansible in el7 - user is +# responsible for knowing they have to install ansible +%if 0%{?rhel} >= 8 +Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0) +%endif %if %{with ansible} BuildRequires: %{ansible_build_dep} @@ -704,6 +714,11 @@ fi %endif %changelog +* Thu Feb 3 2022 Rich Megginson - 1.12.0-2 +- RHEL8.6, 9 - add "Requires: ansible-core or ansible" + Resolves rhbz#2012316 (EL8) + Resolves rhbz#2012298 (EL9) + * Thu Jan 27 2022 Rich Megginson - 1.12.0-1 - vpn - use custom vpn_ipaddr filter to make role work on RHEL 8.6 with ansible-core this is covered by "make roles work with ansible-core on all platforms" BZ