SPECS/scapy.spec

@@ -1,21 +1,11 @@
 Name:           scapy
 Version:        2.5.0
-Release:        7%{?dist}
+Release:        1%{?dist}
 Summary:        Interactive packet manipulation tool and network scanner
 
-%global         gituser         secdev
+License:        GPLv2
-%global         gitname         scapy
+URL:            http://www.secdev.org/projects/scapy/
-%global         commit          95ba5b8504152a1f820bbe679ccf03668cb5118f
+Source0:        https://github.com/secdev/scapy/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-%global         shortcommit     %(c=%{commit}; echo ${c:0:7})
-
-License:        GPL-2.0-only
-URL:            https://scapy.net/
-#was            http://www.secdev.org/projects/scapy/
-VCS:            https://github.com/secdev/scapy
-#               https://github.com/secdev/scapy/releases
-#               https://bitbucket.org/secdev/scapy/pull-request/80
-#               https://scapy.readthedocs.io/en/latest/introduction.html
-Source0:        https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 %global         common_desc %{expand:
 Scapy is a powerful interactive packet manipulation program built on top
@@ -34,7 +24,7 @@ requests and replies, and much more.}
 %bcond_with        python2
 %endif
 
-# By default build the documentation only on Fedora due to cc-by-nc-sa license
+# Build the documentation only on Fedora due to cc-by-nc-sa license
 %if 0%{?fedora}
 %bcond_without     doc
 %else
@@ -49,20 +39,14 @@ BuildArch:      noarch
 BuildRequires:  make
 BuildRequires:  sed
 
-%if %{with python2}
+%if 0%{?with_python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
-%if %{with doc}
-BuildRequires:  python2-tox
-%endif
 %endif
 
-%if %{with python3}
+%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-%if %{with doc}
-BuildRequires:  python%{python3_pkgversion}-tox
-%endif
 %endif
 
 # Recommends only supported on fedora and rhel8+
@@ -74,7 +58,7 @@ Recommends:     wireshark-cli
 
 %description %{common_desc}
 
-%if %{with python2}
+%if 0%{?with_python2}
 %package -n python2-%{name}
 Summary:        Interactive packet manipulation tool and network scanner
 
@@ -92,7 +76,7 @@ Recommends:     ipython2
 %endif
 
 
-%if %{with python3}
+%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{name}
 Summary:        Interactive packet manipulation tool and network scanner
 
@@ -109,10 +93,9 @@ Recommends:     ipython3
 %{common_desc}
 %endif
 
-%if %{with doc}
+%if 0%{?with_doc}
 %package doc
 Summary:        Interactive packet manipulation tool and network scanner
-License:        CC-BY-NC-SA-2.5
 
 BuildRequires:  python%{python3_pkgversion}-sphinx
 BuildRequires:  python%{python3_pkgversion}-sphinx_rtd_theme
@@ -138,19 +121,24 @@ done
 
 
 %build
-%if %{with python2}
+%if 0%{?with_python2}
 %py2_build
 %endif
 
-%if %{with python3}
+%if 0%{?with_python3}
 %py3_build
 %endif
 
-%if %{with doc}
+%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 _build_doc/html/.buildinfo
-rm -f doc/scapy/_build_doc/html/_static/_dummy
+rm -f _build_doc/html/_static/_dummy
+popd
 %endif
 
 
@@ -159,7 +147,7 @@ rm -f doc/scapy/_build_doc/html/_static/_dummy
 install -dp -m0755 %{buildroot}%{_mandir}/man1
 install -Dp -m0644 doc/scapy.1* %{buildroot}%{_mandir}/man1/
 
-%if %{with python2}
+%if 0%{?with_python2}
 %py2_install
 rm -f %{buildroot}%{python2_sitelib}/*egg-info/requires.txt
 
@@ -167,13 +155,13 @@ rm -f %{buildroot}%{python2_sitelib}/*egg-info/requires.txt
 # Rename the executables
 mv -f %{buildroot}%{_bindir}/scapy   %{buildroot}%{_bindir}/scapy2
 
-%if ! %{with python3}
+%if ! 0%{?with_python3}
 # Link the default to the py2 version of executables if py3 not built
 ln -s %{_bindir}/scapy2   %{buildroot}%{_bindir}/scapy
 %endif
 %endif
 
-%if %{with python3}
+%if 0%{?with_python3}
 %py3_install
 rm -f %{buildroot}%{python3_sitelib}/*egg-info/requires.txt
 
@@ -194,22 +182,21 @@ ln -s %{_bindir}/scapy3   %{buildroot}%{_bindir}/scapy
 
 
 
-%if %{with python2}
+%if 0%{?with_python2}
 %files -n python2-%{name}
 %license LICENSE
-%if ! %{with python3}
+%if ! 0%{?with_python3}
 %doc %{_mandir}/man1/scapy.1*
 %{_bindir}/scapy
 %endif
 %{_bindir}/scapy2
 %{python2_sitelib}/scapy/
 %{python2_sitelib}/scapy-*.egg-info
-%exclude %{python2_sitelib}/test/
 %endif
 
 
 
-%if %{with python3}
+%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{name}
 %license LICENSE
 %doc %{_mandir}/man1/scapy.1*
@@ -217,55 +204,36 @@ ln -s %{_bindir}/scapy3   %{buildroot}%{_bindir}/scapy
 %{_bindir}/scapy3
 %{python3_sitelib}/scapy/
 %{python3_sitelib}/scapy-*.egg-info
-%exclude %{python3_sitelib}/test/
+%exclude %{python3_sitelib}/test
 %endif
 
 
-%if %{with doc}
+%if 0%{?with_doc}
 %files doc
 %doc doc/scapy/_build_doc/html
 %endif
 
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.5.0-7
+* Fri Jun 23 2023 Andrea Claudi <aclaudi@redhat.com> - 2.5.0-1.el9
-- Rebuilt for MSVSphere 10
+- Don't package scapy tests (Andrea Claudi)
-
+- Fix scapy compliance with pep-0440 (Andrea Claudi) [2162667]
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.5.0-7
+- New version 2.5.0 (Andrea Claudi) [RHEL-657]
-- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2.5.0-3
-- Rebuilt for Python 3.12
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 02 2023 Jonathan Wright <jonathan@almalinux.org> - 2.5.0-1
-- Update to 2.5.0 rhbz#2156396
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.5-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.4.5-5
-- Rebuilt for Python 3.11
 
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.5-4
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.5-3
+* Fri Jul 23 2021 Andrea Claudi <aclaudi@redhat.com> - 2.4.4-4.el9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Don't build scapy-doc package on rhel (Andrea Claudi) [1973720]
+- Enable gating test on RHEL9 (Jianwen Ji) [1974642]
 
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 2.4.5-2
+* Mon May 31 2021 Miro Hrončok <mhroncok@redhat.com> - 2.4.4-3
-- Rebuilt for Python 3.10
+- Drop build dependency on tox
+- Resolves: rhbz#1956399
 
-* Tue Apr 20 2021 Michal Ambroz <rebus _AT seznam.cz> - 2.4.5-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.4-2
-- bump to 2.4.5 release
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Fri Mar 12 2021 Michal Ambroz <rebus _AT seznam.cz> - 2.4.4-1
 - bump to 2.4.4 release