From 4f71d3d97b1af78bdcf3408e93682157f4353acc Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 28 2022 12:13:00 +0000 Subject: import ansible-collection-microsoft-sql-1.1.1-3.el7_9 --- diff --git a/.ansible-collection-microsoft-sql.metadata b/.ansible-collection-microsoft-sql.metadata index e8ea9c3..86b0247 100644 --- a/.ansible-collection-microsoft-sql.metadata +++ b/.ansible-collection-microsoft-sql.metadata @@ -1,2 +1,2 @@ 99df2e20aff7ec8c244218a45bbcd3d68b791311 SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -6fd1a1faa5e3c0108b1cbc7a031b6e3e5dde76e0 SOURCES/mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz +b4828ecf3eeaaf10e84998f35a63b29e66611a08 SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz diff --git a/.gitignore b/.gitignore index 4ab0844..6841366 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/auto-maintenance-cdc706f14614ef5e80bbce8db10beb369e889df9.tar.gz -SOURCES/mssql-78ea547ef9e23e20015794a1e48c7d6d21229293.tar.gz +SOURCES/mssql-02d2edb8ac7815cc5789a56414c09bfd0700cbb1.tar.gz diff --git a/SPECS/ansible-collection-microsoft-sql.spec b/SPECS/ansible-collection-microsoft-sql.spec index 37cac0c..3b1d1c7 100644 --- a/SPECS/ansible-collection-microsoft-sql.spec +++ b/SPECS/ansible-collection-microsoft-sql.spec @@ -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: 1%{?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 @@ -109,7 +128,7 @@ BuildRequires: highlight # Requirements for galaxy_transform.py BuildRequires: python3 %if 0%{?fedora} || 0%{?rhel} >= 8 -BuildRequires: python3dist(ruamel.yaml) +BuildRequires: %{py3_dist ruamel.yaml} %else BuildRequires: python3-ruamel-yaml %endif @@ -385,6 +404,22 @@ fi %endif %changelog +* Mon May 23 2022 Sergei Petrosian - 1.1.1-3 +- Insert the "Ansible managed" comment to /var/opt/mssql/mssql.conf + Resolves: rhbz#2006233 (EL7) + +- Add Requires: ansible-core or ansible to the spec file + Resolves: rhbz#2089290 (EL7) + +- Users now can provide a custom URLs to pull packages and RPM key from + Resolves: rhbz#2089292 (EL7) + +* Wed Jan 19 2022 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 21 2021 Sergei Petrosian - 1.1.0-1 - Add support for Microsoft SQL Server 2017