From 2959dd3f65ec38cab46de0c449a81136ff8b1d0f Mon Sep 17 00:00:00 2001
From: Sergei Petrosian <spetrosi@redhat.com>
Date: Fri, 17 Jun 2022 19:39:03 +0200
Subject: [PATCH] Add HA MVP and mssql_tls_remote_src

* Fri Jun 17 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.2.0-1
- Add MVP HA functionality to the server role
  Resolves: rhbz#2066337
- Add mssql_tls_remote_src to the server role
  Resolves: rhbz#2098212
- Add Requires: linux-system-roles or rhel-system-roles
- Add downstream values to galaxy.yml
---
 ansible-collection-microsoft-sql.spec | 35 ++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/ansible-collection-microsoft-sql.spec b/ansible-collection-microsoft-sql.spec
index 19dd750..bd7b99d 100644
--- a/ansible-collection-microsoft-sql.spec
+++ b/ansible-collection-microsoft-sql.spec
@@ -25,8 +25,8 @@
 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: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 
 #Group: Development/Libraries
 License: MIT
@@ -63,10 +63,18 @@ License: MIT
 %if 0%{?rhel} >= 8
 Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
 %endif
+
+%if 0%{?fedora}
+Requires: linux-system-roles
+%else
+Requires: rhel-system-roles
+%endif
+
 %if %{with ansible}
 BuildRequires: %{ansible_build_dep}
 %endif
 
+
 %if %{without ansible}
 # We don't have ansible-galaxy.
 # Simply copy everything instead of galaxy-installing the built artifact.
@@ -103,12 +111,12 @@ BuildRequires: %{ansible_build_dep}
 %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}"
 }
 
-%defcommit 1 02d2edb8ac7815cc5789a56414c09bfd0700cbb1
+%defcommit 1 27201be4f2e557a6dcde36463354a1de0cbadb08
 %global rolename1 mssql
 %global target_rolename1 sql-server
 %global collection_rolename1 server
 
-%global mainid cdc706f14614ef5e80bbce8db10beb369e889df9
+%global mainid fe4fd028db23607414acce481388f23ac51cd944
 Source: %{parenturl}/auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz
 Source1: %{archiveurl1}
 
@@ -191,7 +199,13 @@ cp %{rolename1}/.collection/README.md lsr_role2collection/collection_readme.md
 # Copy galaxy.yml for the collection build
 cp %{rolename1}/.collection/galaxy.yml ./
 # Ensure the correct entries in galaxy.yml
-./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" "Ansible collection for Microsoft SQL Server management" > galaxy.yml.tmp
+./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
+                      "Ansible collection for Microsoft SQL Server management" \
+                      "https://github.com/linux-system-roles/mssql" \
+                      "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel/assembly_configuring-microsoft-sql-server-using-microsoft-sql-server-ansible-role_assembly_updating-packages-to-enable-automation-for-the-rhel-system-roles" \
+                      "https://github.com/linux-system-roles/mssql/blob/master/README.md" \
+                      "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=ansible-collection-microsoft-sql" \
+                      > galaxy.yml.tmp
 mv galaxy.yml.tmp galaxy.yml
 
 # Declare the array containing collection rolenames to convert roles to
@@ -206,7 +220,8 @@ for rolename in %{rolenames}; do
         --readme lsr_role2collection/collection_readme.md \
         --namespace %{collection_namespace} --collection %{collection_name} \
         --new-role "${COLLECTION_ROLENAMES[${rolename}]}" \
-        --meta-runtime lsr_role2collection/runtime.yml
+        --meta-runtime lsr_role2collection/runtime.yml \
+        --extra-mapping "fedora.linux_system_roles:redhat.rhel_system_roles"
 done
 
 # removing dot files/dirs
@@ -404,6 +419,14 @@ fi
 %endif
 
 %changelog
+* Fri Jun 17 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.2.0-1
+- Add MVP HA functionality to the server role
+  Resolves: rhbz#2066337
+- Add mssql_tls_remote_src to the server role
+  Resolves: rhbz#2098212
+- Add Requires: linux-system-roles or rhel-system-roles
+- Add downstream values to galaxy.yml
+
 * Mon Mar 21 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-3
 - Fix inserting ansible_managed
   Resolves: rhbz#2057652