import ansible-collection-microsoft-sql-1.2.0-3.el8

.ansible-collection-microsoft-sql.metadata

@@ -1,2 +1,2 @@
 8029565ef251244da3ab57291a9a886560c4c792 SOURCES/auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz
-40390517a3f58663b1785f821840ac8c32d85ff7 SOURCES/mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz
+2538b3a5050c7eb05a446db5790f89d323d112f3 SOURCES/mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz
-SOURCES/mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz
+SOURCES/mssql-4eb3dd55defd801a5032efa597983cbbec4bbeea.tar.gz

SPECS/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