diff --git a/.gitignore b/.gitignore index b294f83..9c3e29b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz /mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz +/auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz +/mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz diff --git a/ansible-collection-microsoft-sql.spec b/ansible-collection-microsoft-sql.spec index fdaea6b..f0d87d5 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: 2%{?dist} #Group: Development/Libraries License: MIT @@ -63,6 +63,13 @@ 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 @@ -103,12 +110,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 +198,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 +219,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,19 +418,30 @@ fi %endif %changelog +* Fri Jun 17 2022 Sergei Petrosian - 1.2.0-2 + Return mistakenly deleted galaxy.yml string and bump release + +* Fri Jun 17 2022 Sergei Petrosian - 1.2.0-1 +- Add MVP HA functionality to the server role + Resolves: rhbz#2066338 +- Add mssql_tls_remote_src to the server role + Resolves: rhbz#2039990 +- Add Requires: linux-system-roles or rhel-system-roles +- Add downstream values to galaxy.yml + * Mon Mar 21 2022 Sergei Petrosian - 1.1.1-3 - Fix inserting ansible_managed - Resolves: rhbz#2057651 (EL8) + Resolves: rhbz#2065206 - Users now can provide a custom URLs to pull packages and RPM key from - Resolves: rhbz#2038256 (EL8) + Resolves: rhbz#2067175 * Fri Mar 18 2022 Sergei Petrosian - 1.1.1-2 - RHEL8.6, 9 - add "Requires: ansible-core or ansible" - Resolves: rhbz#2065664 (EL8) + Resolves: rhbz#2067172 * Thu Mar 17 2022 Sergei Petrosian - 1.1.1-1 - Insert the "Ansible managed" comment to the /var/opt/mssql/mssql.conf file - Resolves rhbz#2057651 (EL8) + Resolves rhbz#2065206 * Wed Jan 19 2022 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 9b1c2d5..ef898c2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz) = b1e57a6b59dd9317f2273a89759fcb92c59b818711b036c459043cf01570c86cebfeb2d5643e7c629da4c35167091454b18c91b39f3663b8464dda4758dc4ac1 -SHA512 (mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz) = a4606abf56418a98e3dc498e7a847fe97d85257a2af15821ae9d768668b0ecd90b6ee49c3e58f84c42cba68ab7aafeed09131489290ef115239ea65e18af50f1 +SHA512 (auto-maintenance-fe4fd028db23607414acce481388f23ac51cd944.tar.gz) = d2d627f7c7500c5e0250a2270129d50e425414c900026b4be0f9bcb65630156d27742f9db6896f9908f12734571719caef6341ef662726dd2fd286ebc7a114fc +SHA512 (mssql-27201be4f2e557a6dcde36463354a1de0cbadb08.tar.gz) = 48e1259a9e99dd0892ac9e7115f80cc7217331d17cf02f9310f746d7cc1fcbed9cc63f0bfa032b286e8f8c2a932a22565dc0526bf2308289770746d7938a4980