From a5925112ba68faa7946dc3ef98b07af3de0d1f20 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 05 2022 13:33:06 +0000
Subject: import ansible-collection-microsoft-sql-1.1.1-3.el8


---

diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata
index c3da17c..86b0247 100644
--- a/.ansible-collection-microsoft-sql.metadata
+++ b/.ansible-collection-microsoft-sql.metadata
@@ -1,2 +1,2 @@
 99df2e20aff7ec8c244218a45bbcd3d68b791311 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz
-faebfa1338e5f0301a87d60317e46c54739465d4 SOURCES/mssql-687c82fa4f28edf8387d59e3c7b21f273636ac66.tar.gz
+b4828ecf3eeaaf10e84998f35a63b29e66611a08 SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz
diff --git a/.gitignore b/.gitignore
index 8764806..6841366 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz
-SOURCES/mssql-687c82fa4f28edf8387d59e3c7b21f273636ac66.tar.gz
+SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz
diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec
index bdd95b4..fdaea6b 100644
--- a/SPECS/ansible-collection-microsoft-sql.spec
+++ b/SPECS/ansible-collection-microsoft-sql.spec
@@ -1,7 +1,16 @@
+# NOTE: Even though ansible-core is in 8.6, it is only available
+# at *runtime*, not at *buildtime* - so we can't have
+# ansible-core as a build_dep on RHEL8
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without ansible
+%global ansible_build_dep ansible-core >= 2.11.0
+%else
 %if 0%{?rhel} && ! 0%{?epel}
 %bcond_with ansible
 %else
 %bcond_without ansible
+%global ansible_build_dep ansible >= 2.9.10
+%endif
 %endif
 
 %bcond_with collection_artifact
@@ -17,7 +26,7 @@ Name: ansible-collection-microsoft-sql
 Url: https://github.com/linux-system-roles/mssql
 Summary: The Ansible collection for Microsoft SQL Server management
 Version: 1.1.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 #Group: Development/Libraries
 License: MIT
@@ -44,8 +53,18 @@ License: MIT
 %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 >= 2.9.10
+BuildRequires: %{ansible_build_dep}
 %endif
 
 %if %{without ansible}
@@ -84,7 +103,7 @@ BuildRequires: ansible >= 2.9.10
 %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}"
 }
 
-%defcommit 1 687c82fa4f28edf8387d59e3c7b21f273636ac66
+%defcommit 1 02d2edb8ac7815cc5789a56414c09bfd0700cbb1
 %global rolename1 mssql
 %global target_rolename1 sql-server
 %global collection_rolename1 server
@@ -385,10 +404,19 @@ fi
 %endif
 
 %changelog
+* Mon Mar 21 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-3
+- Fix inserting ansible_managed
+  Resolves: rhbz#2057651 (EL8)
+- Users now can provide a custom URLs to pull packages and RPM key from
+  Resolves: rhbz#2038256 (EL8)
+
+* Fri Mar 18 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-2
+- RHEL8.6, 9 - add "Requires: ansible-core or ansible"
+  Resolves: rhbz#2065664 (EL8)
+
 * Thu Mar 17 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-1
 - Insert the "Ansible managed" comment to the /var/opt/mssql/mssql.conf file
   Resolves rhbz#2057651 (EL8)
-  Resolves rhbz#2064690 (EL9)
 
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild