From d349c3c366281922a54376758234d10b977a599b Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 31 Jan 2022 20:40:17 -0500
Subject: [PATCH] Drop legacy ansible package support and make compatibile with
 RHEL 8.6+

---
 ansible-generator      | 2 +-
 ansible-packaging.spec | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ansible-generator b/ansible-generator
index 71bff9f..862947e 100755
--- a/ansible-generator
+++ b/ansible-generator
@@ -38,7 +38,7 @@ def main():
                     f"ansible-collection({info['namespace']}.{info['name']}) = {info['version']}"
                 )
             if args.action == "requires":
-                print("(ansible >= 2.9.0 or ansible-core >= 2.11.0)")
+                print("ansible-core >= 2.12.0")
                 for dep, req in info.get("dependencies", {}).items():
                     print(f"ansible-collection({dep})", end="")
                     if req == "*":
diff --git a/ansible-packaging.spec b/ansible-packaging.spec
index efa7410..4aec199 100644
--- a/ansible-packaging.spec
+++ b/ansible-packaging.spec
@@ -1,6 +1,6 @@
 Name:           ansible-packaging
 Version:        1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        RPM packaging macros and generators for Ansible collections
 
 License:        GPLv3+
@@ -13,7 +13,7 @@ Source3:        COPYING
 Requires:       ansible-core
 
 # Conflict with anything providing its own copies of these files
-%if ! (0%{?rhel} >= 9)
+%if ! (0%{?rhel} >= 8)
 Conflicts:      ansible-core < 2.12.1-3
 %endif
 Conflicts:      ansible <= 2.9.99
@@ -47,6 +47,10 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
 
 
 %changelog
+* Mon Jan 31 2022 Neal Gompa <ngompa@fedoraproject.org> - 1-3
+- Drop vestigial support for the legacy ansible package
+- Make compatibile with RHEL 8.6+
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild