diff --git a/.gitignore b/.gitignore index abd1e9f..237c3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /standard-test-roles-2.11.tar.gz /standard-test-roles-2.12.tar.gz /standard-test-roles-2.13.tar.gz +/standard-test-roles-2.14.tar.gz diff --git a/sources b/sources index 3ae08bf..01339d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (standard-test-roles-2.13.tar.gz) = b81efa1dfd5fe191e6ffd4f52c9ba3f8f06134369946b3e763d7cc1d9455eb1ded55e130e4092620b7a83ea96286ccd48ea10f16dda3729e6e9ea33b0472b628 +SHA512 (standard-test-roles-2.14.tar.gz) = 2d92a4e44357cacad18dc59adc22df9ed51055084329cd81ad6973b0cacb9acacc89dce1090af0802aaf80970c805a39c45181cf7be0f07b9914d61dce156af0 diff --git a/standard-test-roles.spec b/standard-test-roles.spec index 3c86834..adf7d81 100644 --- a/standard-test-roles.spec +++ b/standard-test-roles.spec @@ -1,5 +1,5 @@ Name: standard-test-roles -Version: 2.13 +Version: 2.14 Release: 1%{?dist} Summary: Standard Test Interface Ansible roles @@ -9,11 +9,17 @@ Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: coreutils -Requires: ansible +Requires: ansible fmf # We want the real ssh for Ansible, otherwise it may fall back to paramiko # which doesn't work in a whole lot of scenarios. Ref: PR1 for STR. Requires: openssh-clients +%if 0%{?fedora} +# fmf in epel7 uses python2-fmf +# fmf in Fedora uses python3-fmf +Requires: python2-fmf +%endif + %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 Recommends: docker Recommends: genisoimage @@ -56,6 +62,9 @@ cp -p inventory/* %{buildroot}%{_datadir}/ansible/inventory/ %changelog +* Fri Jun 29 2018 Andrei Stepanov - 2.14-1 +- Build with the latest merged PRs. + * Fri May 25 2018 Andrei Stepanov - 2.13-2 - Build with the latest merged PRs.