Rebase to latest upstream

- Fix inserting ansible_managed
  Resolves: rhbz#2057652
- Users now can provide a custom URLs to pull packages and RPM key from
  Resolves: rhbz#2070452
- Add "Requires: ansible-core or ansible"
  Resolves: rhbz#2067496
This commit is contained in:
Sergei Petrosian 2022-03-25 16:24:52 +01:00
parent b71dfde639
commit b8b82a3232
3 changed files with 48 additions and 5 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz
/mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz
/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz

View File

@ -1,7 +1,16 @@
# NOTE: Even though ansible-core is in 8.6, it is only available
# at *runtime*, not at *buildtime* - so we can't have
# ansible-core as a build_dep on RHEL8
%if 0%{?fedora} || 0%{?rhel} >= 9
%bcond_without ansible
%global ansible_build_dep ansible-core >= 2.11.0
%else
%if 0%{?rhel} && ! 0%{?epel}
%bcond_with ansible
%else
%bcond_without ansible
%global ansible_build_dep ansible >= 2.9.10
%endif
%endif
%bcond_with collection_artifact
@ -16,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.0
Release: 2%{?dist}
Version: 1.1.1
Release: 3%{?dist}
#Group: Development/Libraries
License: MIT
@ -44,8 +53,18 @@ License: MIT
%endif
%endif
# ansible-core is in rhel 8.6 and later - default to ansible-core, but allow
# the use of ansible if present - we may revisit this if the automatic dependency
# generator is added to ansible-core in RHEL
# Fedora - the automatic generator will add this - no need to explicit declare
# it in the spec file
# EL7 - no dependency on ansible because there is no ansible in el7 - user is
# responsible for knowing they have to install ansible
%if 0%{?rhel} >= 8
Requires: (ansible-core >= 2.11.0 or ansible >= 2.9.0)
%endif
%if %{with ansible}
BuildRequires: ansible >= 2.9.10
BuildRequires: %{ansible_build_dep}
%endif
%if %{without ansible}
@ -84,7 +103,7 @@ BuildRequires: ansible >= 2.9.10
%%global collection_rolenames %%{?collection_rolenames} [%{rolename%{1}}]="%{collection_rolename%{1}}"
}
%defcommit 1 78ea547ef9e23e20015794a1e48c7d6d21229293
%defcommit 1 02d2edb8ac7815cc5789a56414c09bfd0700cbb1
%global rolename1 mssql
%global target_rolename1 sql-server
%global collection_rolename1 server
@ -385,9 +404,32 @@ fi
%endif
%changelog
* Mon Mar 21 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-3
- Fix inserting ansible_managed
Resolves: rhbz#2057652
- Users now can provide a custom URLs to pull packages and RPM key from
Resolves: rhbz#2070452
- Add "Requires: ansible-core or ansible"
Resolves: rhbz#2067496
* Fri Mar 18 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-2
- RHEL8.6, 9 - add "Requires: ansible-core or ansible"
Resolves: rhbz#2065669 (EL9)
* Thu Mar 17 2022 Sergei Petrosian <spetrosi@redhat.com> - 1.1.1-1
- Insert the "Ansible managed" comment to the /var/opt/mssql/mssql.conf file
Resolves rhbz#2064690 (EL9)
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Sep 23 2021 Sergei Petrosian <spetrosi@redhat.com> - 1.1.0-2
- Bump release to build with gating.yaml added
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 21 2021 Sergei Petrosian <spetrosi@redhat.com> - 1.1.0-1
- Add support for Microsoft SQL Server 2017

View File

@ -1,2 +1,2 @@
SHA512 (auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz) = b1e57a6b59dd9317f2273a89759fcb92c59b818711b036c459043cf01570c86cebfeb2d5643e7c629da4c35167091454b18c91b39f3663b8464dda4758dc4ac1
SHA512 (mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz) = 4becf7bf17f4b0337f0bfb33e51e0957f55b68083d463c784e4a76db1c62acdbfbfb0d3c5e1e0abda87ea408e2ee48be0efd7085d7285ffcb299853580931c13
SHA512 (mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz) = a4606abf56418a98e3dc498e7a847fe97d85257a2af15821ae9d768668b0ecd90b6ee49c3e58f84c42cba68ab7aafeed09131489290ef115239ea65e18af50f1