diff --git a/python-ansible-runner.spec b/python-ansible-runner.spec index 8cfb98a..b64061d 100644 --- a/python-ansible-runner.spec +++ b/python-ansible-runner.spec @@ -11,7 +11,7 @@ Name: python-%{pypi_name} Version: 2.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A tool and python library to interface with Ansible License: ASL 2.0 @@ -22,7 +22,7 @@ Source0: https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{ # Source0: https://github.com/ansible/%%{pypi_name}/archive/%%{version}/%%{pypi_name}-%%{version}.tar.gz BuildArch: noarch -BuildRequires: ansible >= 2.6 +BuildRequires: ansible-core %if %{with python2} BuildRequires: python-daemon %if 0%{?el7} @@ -101,7 +101,7 @@ standalone tool, or imported into a python project. Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} -Requires: ansible >= 2.6 +Requires: (ansible-core or ansible) Requires: python3-daemon Requires: python3dist(pexpect) >= 4.6 Requires: python3dist(psutil) @@ -134,13 +134,13 @@ sed -i '166 i \@pytest.mark.skip(reason="can not resolve example.com in build sy %if %{with python2} %py2_install cp %{buildroot}/%{_bindir}/ansible-runner %{buildroot}/%{_bindir}/ansible-runner-%{python2_version} -ln -s %{_bindir}/ansible-runner-%{python2_version} %{buildroot}/%{_bindir}/ansible-runner-2 +ln -s ansible-runner-%{python2_version} %{buildroot}/%{_bindir}/ansible-runner-2 %endif %if %{with python3} %py3_install cp %{buildroot}/%{_bindir}/ansible-runner %{buildroot}/%{_bindir}/ansible-runner-%{python3_version} -ln -s %{_bindir}/ansible-runner-%{python3_version} %{buildroot}/%{_bindir}/ansible-runner-3 +ln -s ansible-runner-%{python3_version} %{buildroot}/%{_bindir}/ansible-runner-3 %endif %check @@ -176,10 +176,15 @@ PYTHONPATH=$PYTHONPATH:%{python3_sitelib} PATH=$PATH:%{buildroot}%{_bindir} py.t %exclude %{python3_sitelib}/test %changelog +* Mon Apr 11 2022 Maxwell G - 2.1.3-2 +- Allow users to choose between ansible and ansible-core. +- Switch BR from ansible to ansible-core. +- Use relative symlinks. + * Thu Mar 24 2022 Dan Radez - 2.1.3-1 - Update to 2.1.3 -* Tue Feb 08 2022 Dan Radez - 2.1.1-3 +* Tue Feb 08 2022 Dan radez - 2.1.1-3 - Don't remove egginfo * Fri Jan 21 2022 Fedora Release Engineering - 2.1.1-2