Restore compatability with f34 and f35.

epel8
Maxwell G 3 years ago
parent d349c3c366
commit 854a0868b7
No known key found for this signature in database
GPG Key ID: F79E4E25E8C661F8

@ -38,7 +38,7 @@ def main():
f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}" f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}"
) )
if args.action == "requires": if args.action == "requires":
print("ansible-core >= 2.12.0") print("(ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))")
for dep, req in info.get("dependencies", {}).items(): for dep, req in info.get("dependencies", {}).items():
print(f"ansible-collection({dep})", end="") print(f"ansible-collection({dep})", end="")
if req == "*": if req == "*":

@ -1,6 +1,6 @@
Name: ansible-packaging Name: ansible-packaging
Version: 1 Version: 1
Release: 3%{?dist} Release: 4%{?dist}
Summary: RPM packaging macros and generators for Ansible collections Summary: RPM packaging macros and generators for Ansible collections
License: GPLv3+ License: GPLv3+
@ -10,13 +10,15 @@ Source1: ansible.attr
Source2: macros.ansible Source2: macros.ansible
Source3: COPYING Source3: COPYING
Requires: ansible-core # Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core.
Requires: (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))
Suggests: ansible-core
# Conflict with anything providing its own copies of these files # Conflict with anything providing its own copies of these files
%if ! (0%{?rhel} >= 8) %if ! (0%{?rhel} >= 8)
Conflicts: ansible-core < 2.12.1-3 Conflicts: ansible-core < 2.12.1-3
%endif %endif
Conflicts: ansible <= 2.9.99 Conflicts: ansible < 2.9.27-3
BuildArch: noarch BuildArch: noarch
@ -47,6 +49,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
%changelog %changelog
* Tue Apr 26 2022 Maxwell G <gotmax@e.email> - 1-4
- Restore compatability with f34 and f35.
* Mon Jan 31 2022 Neal Gompa <ngompa@fedoraproject.org> - 1-3 * Mon Jan 31 2022 Neal Gompa <ngompa@fedoraproject.org> - 1-3
- Drop vestigial support for the legacy ansible package - Drop vestigial support for the legacy ansible package
- Make compatibile with RHEL 8.6+ - Make compatibile with RHEL 8.6+

@ -1,3 +1,4 @@
%__ansible_provides %{_rpmconfigdir}/ansible-generator --provides %__ansible_provides %{_rpmconfigdir}/ansible-generator --provides
%__ansible_requires %{_rpmconfigdir}/ansible-generator --requires %__ansible_requires %{_rpmconfigdir}/ansible-generator --requires
%__ansible_suggests /usr/bin/echo ansible-core
%__ansible_path ^%{_datadir}/ansible/collections/ansible_collections/[^/]+/[^/]+/MANIFEST.json$ %__ansible_path ^%{_datadir}/ansible/collections/ansible_collections/[^/]+/[^/]+/MANIFEST.json$

Loading…
Cancel
Save