| |
@@ -1,5 +1,4 @@
|
| |
- # NOTE - may revisit this once ansible-core is in 8.6
|
| |
- %if 0%{?fedora} || 0%{?rhel} >= 9
|
| |
+ %if 0%{?fedora} || 0%{?rhel} >= 8
|
| |
%bcond_without ansible
|
| |
%global ansible_build_dep ansible-core >= 2.11.0
|
| |
%else
|
| |
@@ -29,7 +28,7 @@
|
| |
Url: https://github.com/linux-system-roles
|
| |
Summary: Set of interfaces for unified system management
|
| |
Version: 1.11.0
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
|
| |
#Group: Development/Libraries
|
| |
License: GPLv3+ and MIT and BSD and Python
|
| |
@@ -70,6 +69,16 @@
|
| |
%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}
|
| |
@@ -735,6 +744,9 @@
|
| |
%endif
|
| |
|
| |
%changelog
|
| |
+ * Tue Dec 14 2021 Rich Megginson <rmeggins@redhat.com> - 1.11.0-2
|
| |
+ - RHEL8.6, 9 - add "Requires: ansible-core or ansible"
|
| |
+
|
| |
* Thu Dec 2 2021 Rich Megginson <rmeggins@redhat.com> - 1.11.0-1
|
| |
- timesync - fix ansible 2.12 issues, service_facts issues
|
| |
Resolves rhbz#2012316 (EL8)
|
| |
ansible-core is now part of RHEL 8.6 and later. If the user
installs the system roles RPM, we should install the most
appropriate version of ansible, which is ansible-core by default.
This should also work in other cases where the user may have
installed the
ansible
engine RPM - in that case, installingthe system roles RPM should use the
ansible
already installedon the system.