diff --git a/ansible.spec b/ansible.spec index 2b0afc74089f2e6af9c06e569fcaa8bc49532f90..81243baa841f16ce50b4ac5e6e67a588edae4582 100644 --- a/ansible.spec +++ b/ansible.spec @@ -1,5 +1,4 @@ %global with_docs 0 -%global with_python3 1 %global common_desc \ Ansible is a radically simple model-driven configuration management,\ multi-node deployment, and remote task execution system. Ansible works \ @@ -11,7 +10,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system Version: 2.9.27 -Release: 2 +Release: 3 License: Python-2.0 and MIT and GPL+ Url: http://ansible.com Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz @@ -19,33 +18,25 @@ Patch0: hostname-module-support-openEuler.patch BuildArch: noarch Provides: ansible-fireball = %{version}-%{release} Obsoletes: ansible-fireball < 1.2.4 -BuildRequires: python3-jinja2 python3-devel python3-packaging python3-pyyaml +BuildRequires: python3-jinja2 python3-devel python3-packaging python3-pyyaml python3-setuptools +BuildRequires: python3-PyYAML python3-paramiko python3-cryptography +BuildRequires: python3-pexpect python3-pywinrm git-core +BuildRequires: python3-six python3-pytest python3-pytest-xdist +BuildRequires: python3-pytest-mock python3-requests python3-coverage python3-mock +BuildRequires: python3-boto3 python3-botocore python3-passlib Requires: python3-PyYAML python3-cryptography python3-paramiko Requires: python3-setuptools python3-six sshpass python3-httplib2 Requires: python3-jmespath python3-jinja2 Recommends: %{name}-help = %{version}-%{release} -%description -%{common_desc} -%if 0%{?with_python3} Provides: ansible-python3 = %{version}-%{release} Obsoletes: ansible-python3 < %{version}-%{release} -BuildRequires: python3-devel python3-setuptools -BuildRequires: python3-PyYAML python3-paramiko python3-cryptography python3-packaging -BuildRequires: python3-pexpect python3-winrm -BuildRequires: git-core %if %with_docs BuildRequires: python3-sphinx python3-sphinx-theme-alabaster asciidoc %endif -BuildRequires: python3-six python3-nose python3-pytest python3-pytest-xdist -BuildRequires: python3-pytest-mock python3-requests python3-coverage python3-mock -BuildRequires: python3-boto3 python3-botocore python3-passlib python3-jinja2 -Requires: python3-PyYAML python3-paramiko python3-crypto python3-setuptools python3-six -Requires: python3-jinja2 sshpass python3-jmespath %description %{common_desc} -%endif %package -n ansible-help Summary: Documentation for Ansible @@ -57,13 +48,10 @@ Obsoletes: %{name}-doc < %{name}-%{release} %prep %setup -q %patch0 -p1 -%if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} -%endif %build -%if 0%{?with_python3} pushd %{py3dir} %py3_build %if %with_docs @@ -71,10 +59,8 @@ pushd %{py3dir} make PYTHON=/usr/bin/python3 SPHINXBUILD=sphinx-build-3 webdocs %endif popd -%endif %install -%if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py install --root=$RPM_BUILD_ROOT popd @@ -84,7 +70,6 @@ for i in $RPM_BUILD_ROOT/%{_bindir}/ansible* ; do ln -s %{_bindir}/$(basename $i)-%{python3_version} $i-3 fi done -%endif mkdir -p $RPM_BUILD_ROOT/etc/ansible/ mkdir -p $RPM_BUILD_ROOT/etc/ansible/roles/ cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/ @@ -105,9 +90,7 @@ cp -pr docs/docsite/rst . %{_bindir}/ansible* %config(noreplace) %{_sysconfdir}/ansible/ %doc %{_mandir}/man1/ansible* -%if 0%{?with_python3} %{python3_sitelib}/ansible* -%endif %files -n ansible-help %doc rst @@ -116,6 +99,9 @@ cp -pr docs/docsite/rst . %endif %changelog +* Wed Apr 19 2023 liyanan - 2.9.27-3 +- Remove with_python3 macros and python3-nose buildRequire + * Fri Mar 18 2022 huangtianhua - 2.9.27-2 - Remove require python-keyczar and modify require crypto to cryptography