Drop build dependency on tox

Resolves: rhbz#1956399
This commit is contained in:
Miro Hrončok 2021-05-31 15:56:08 +02:00
parent 038b2aa7fe
commit 71b7e779d2

View File

@ -1,6 +1,6 @@
Name: scapy
Version: 2.4.4
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Interactive packet manipulation tool and network scanner
%global gituser secdev
@ -52,13 +52,11 @@ BuildRequires: sed
%if 0%{?with_python2}
BuildRequires: python2-devel
BuildRequires: python2-setuptools
BuildRequires: python2-tox
%endif
%if 0%{?with_python3}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python%{python3_pkgversion}-tox
%endif
# Recommends only supported on fedora and rhel8+
@ -142,10 +140,15 @@ done
%endif
%if 0%{?with_doc}
make -C doc/scapy html BUILDDIR=_build_doc SPHINXBUILD=sphinx-build-%python3_version
# the following commands are copied from tox.ini to avoid a dependency on tox
pushd doc/scapy
sphinx-apidoc-%python3_version -f --no-toc --separate --module-first --output-dir api ../../scapy ../../scapy/modules/ ../../scapy/libs/ ../../scapy/tools/ ../../scapy/arch/ ../../scapy/contrib/cansocket* ../../scapy/contrib/scada/* ../../scapy/all.py ../../scapy/layers/all.py
%{python3} sphinx_apidoc_postprocess.py
make html BUILDDIR=_build_doc SCAPY_APITREE=0 SPHINXBUILD=sphinx-build-%python3_version
rm -f doc/scapy/_build_doc/html/.buildinfo
rm -f doc/scapy/_build_doc/html/_static/_dummy
rm -f _build_doc/html/.buildinfo
rm -f _build_doc/html/_static/_dummy
popd
%endif
@ -229,6 +232,10 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
%changelog
* Mon May 31 2021 Miro Hrončok <mhroncok@redhat.com> - 2.4.4-3
- Drop build dependency on tox
- Resolves: rhbz#1956399
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.4-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937