diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata index 949be59..e8ea9c3 100644 --- a/.ansible-collection-microsoft-sql.metadata +++ b/.ansible-collection-microsoft-sql.metadata @@ -1,2 +1,2 @@ 99df2e20aff7ec8c244218a45bbcd3d68b791311 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -7d6738dbe93c05da515fbe1eccaf4da2b5e4f167 SOURCES/mssql-8def8ff95f8d75604b99eec1093d4f2c99b96bd1.tar.gz +6fd1a1faa5e3c0108b1cbc7a031b6e3e5dde76e0 SOURCES/mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz diff --git a/.gitignore b/.gitignore index 7fe2954..4ab0844 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -SOURCES/mssql-8def8ff95f8d75604b99eec1093d4f2c99b96bd1.tar.gz +SOURCES/mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec index 9e7cc0a..37cac0c 100644 --- a/SPECS/ansible-collection-microsoft-sql.spec +++ b/SPECS/ansible-collection-microsoft-sql.spec @@ -16,7 +16,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.0.12 +Version: 1.1.0 Release: 1%{?dist} #Group: Development/Libraries @@ -84,7 +84,7 @@ BuildRequires: ansible >= 2.9.10 %%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}" } -%defcommit 1 8def8ff95f8d75604b99eec1093d4f2c99b96bd1 +%defcommit 1 78ea547ef9e23e20015794a1e48c7d6d21229293 %global rolename1 mssql %global target_rolename1 sql-server %global collection_rolename1 server @@ -307,9 +307,9 @@ format_item_for_files() { else echo "%doc $files_item" fi - elif [[ "$item" == */COPYING* ]] || [[ "$item" == */LICENSE* ]]; then - echo "%%license $files_item" - else + elif [[ "$item" != */COPYING* ]] && [[ "$item" != */LICENSE* ]]; then + # Avoid dynamically using the license macro since the license macro + # is replaced with the value of License directive in the older rpmbuild. echo "$files_item" fi } @@ -376,6 +376,8 @@ fi %{_pkgdocdir}/collection/roles/*/README.html %endif %license %{_pkglicensedir}/* +%license %{installbase}/*/LICENSE* +%license %{ansible_collection_files}/%{collection_name}/LICENSE* %if %{with collection_artifact} %files collection-artifact @@ -383,6 +385,14 @@ fi %endif %changelog +* Wed Jul 21 2021 Sergei Petrosian - 1.1.0-1 +- Add support for Microsoft SQL Server 2017 + +* Mon Jul 19 2021 Sergei Petrosian - 1.0.12-2 +- Copy fix for RHEL 7 builds from rhel-system-roles + Link to the original fix: + https://src.fedoraproject.org/rpms/linux-system-roles/c/093981119f99ac51a6e06a2714b587e4e2fe287c + * Tue Jul 13 2021 Sergei Petrosian - 1.0.12-1 - Add the meta-runtime option from the latest auto-maintenance - Use the latest mssql that ships fixes for issues #24,#25,#26,#27,#28,35