From 379ca137e5bbda9528dba77283a8b602b4b70347 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 8 Jul 2022 14:10:20 +0000
Subject: [PATCH] Auto sync2gitlab import of
 ansible-collection-microsoft-sql-1.2.0-3.el8.src.rpm

---
 .gitignore                            |  1 +
 ansible-collection-microsoft-sql.spec | 28 +++++++++++++++++++++++----
 sources                               |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c3e29b..b6b9d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz
 /auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz
 /mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz
+/mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz
diff --git a/ansible-collection-microsoft-sql.spec b/ansible-collection-microsoft-sql.spec
index f0d87d5..c08ad77 100644
--- a/ansible-collection-microsoft-sql.spec
+++ b/ansible-collection-microsoft-sql.spec
@@ -26,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.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 #Group: Development/Libraries
 License: MIT
@@ -110,7 +110,7 @@ BuildRequires: %{ansible_build_dep}
 %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}"
 }
 
-%defcommit 1 27201be4f2e557a6dcde36463354a1de0cbadb08
+%defcommit 1 4eb3dd55defd801a5032efa597983cbbec4bbeea
 %global rolename1 mssql
 %global target_rolename1 sql-server
 %global collection_rolename1 server
@@ -197,7 +197,9 @@ mkdir .collections
 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
+%if 0%{?rhel}
 ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
                       "Ansible collection for Microsoft SQL Server management" \
                       "https://github.com/linux-system-roles/mssql" \
@@ -205,11 +207,24 @@ cp %{rolename1}/.collection/galaxy.yml ./
                       "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
+%else
+./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
+                      "Ansible collection for Microsoft SQL Server management" \
+                      > galaxy.yml.tmp
+%endif
 mv galaxy.yml.tmp galaxy.yml
 
 # Declare the array containing collection rolenames to convert roles to
 declare -A COLLECTION_ROLENAMES=(%{collection_rolenames})
 
+# Replace fedora.linux_system_roles with redhat.rhel_system_roles
+%if 0%{?rhel}
+for rolename in %{rolenames}; do
+    sed -i 's/fedora\.linux_system_roles/redhat.rhel_system_roles/g' \
+    $rolename/tasks/*.yml $rolename/tests/*.yml $rolename/meta/*.yml
+done
+%endif
+
 # Convert roles to the collection format
 for rolename in %{rolenames}; do
     python3 lsr_role2collection.py --role "$rolename" \
@@ -219,8 +234,7 @@ 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 \
-        --extra-mapping "fedora.linux_system_roles:redhat.rhel_system_roles"
+        --meta-runtime lsr_role2collection/runtime.yml
 done
 
 # removing dot files/dirs
@@ -418,6 +432,12 @@ fi
 %endif
 
 %changelog
+* Mon Jul 4 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.2.0-3
+- Update mssql commit
+  Resolves: rhbz#2066338
+- Add condition for upstream spec build for galaxy_transform
+- Replace extra-mapping with replacing in the legacy format with sed
+
 * Fri Jun 17 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.2.0-2
   Return mistakenly deleted galaxy.yml string and bump release
 
diff --git a/sources b/sources
index ef898c2..6db5406 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz) = d2d627f7c7500c5e0250a2270129d50e425414c900026b4be0f9bcb65630156d27742f9db6896f9908f12734571719caef6341ef662726dd2fd286ebc7a114fc
-SHA512 (mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz) = 48e1259a9e99dd0892ac9e7115f80cc7217331d17cf02f9310f746d7cc1fcbed9cc63f0bfa032b286e8f8c2a932a22565dc0526bf2308289770746d7938a4980
+SHA512 (mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz) = aead90c53c2e22083704e0fa01fb0e5715346b7ee68f03cba59b1698938608b757f94a8c083086d25588e8b3ccb05fd591b56da0af76400a22f978692bb5827b