packages/ansible
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!54 Remove with_python3 macros and python3-nose buildRequire

Browse Source 
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-04-20 00:53:54 +00:00 committed by Gitee
commit f14d2414a6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ansible.spec
View File

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