diff --git a/scapy.spec b/scapy.spec index d3bd6ef..9663830 100644 --- a/scapy.spec +++ b/scapy.spec @@ -1,6 +1,6 @@ Name: scapy Version: 2.4.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Interactive packet manipulation tool and network scanner %global gituser secdev @@ -18,8 +18,6 @@ Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar BuildArch: noarch BuildRequires: sed -BuildRequires: python2 >= 2.5 -BuildRequires: python2-devel >= 2.5 BuildRequires: python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-devel @@ -33,23 +31,10 @@ requests and replies, and much more. -%package -n python2-%{name} -Summary: Interactive packet manipulation tool and network scanner - -%{?python_provide:%python_provide python2-%{name}} - -%description -n python2-%{name} -Scapy is a powerful interactive packet manipulation program built on top -of the Python interpreter. It can be used to forge or decode packets of -a wide number of protocols, send them over the wire, capture them, match -requests and replies, and much more. - %package -n python%{python3_pkgversion}-%{name} Summary: Interactive packet manipulation tool and network scanner - %{?python_provide:%python_provide python%{python3_pkgversion}-%{name}} -Provides: %{name} - +Provides: %{name} = %{version}-%{release} %description -n python%{python3_pkgversion}-%{name} Scapy is a powerful interactive packet manipulation program built on top @@ -58,37 +43,16 @@ a wide number of protocols, send them over the wire, capture them, match requests and replies, and much more. - %prep %autosetup -p 1 -n %{name}-%{version} - %build -%py2_build %py3_build - %install install -Dp -m0644 doc/scapy.1.gz %{buildroot}%{_mandir}/man1/scapy.1.gz -%py2_install -rm -f %{buildroot}%{python2_sitelib}/*egg-info/requires.txt - -# Remove shebang -for FILE in %{buildroot}%{python2_sitelib}/scapy/contrib/*.py \ - %{buildroot}%{python2_sitelib}/scapy/pipetool.py \ - %{buildroot}%{python2_sitelib}/scapy/layers/inet6.py \ - %{buildroot}%{python2_sitelib}/scapy/tools/check_asdis.py; do - sed -i.orig -e 1d "${FILE}" - touch -r "${FILE}.orig" "${FILE}" - rm "${FILE}.orig" -done - -# Rename the executables -mv -f %{buildroot}%{_bindir}/scapy %{buildroot}%{_bindir}/scapy2 -mv -f %{buildroot}%{_bindir}/UTscapy %{buildroot}%{_bindir}/UTscapy2 - %py3_install rm -f %{buildroot}%{python3_sitelib}/*egg-info/requires.txt @@ -116,32 +80,26 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy # check # TODO: Need to fix/remove slow/failed test # cd test/ -# ./run_tests_py2 || true # ./run_tests_py3 || true -%files -n python2-%{name} -%doc %{_mandir}/man1/scapy.1* -%{_bindir}/scapy2 -%{_bindir}/UTscapy2 -%{python2_sitelib}/scapy/* -%{python2_sitelib}/scapy-*.egg-info - - - %files -n python%{python3_pkgversion}-%{name} %doc %{_mandir}/man1/scapy.1* %{_bindir}/scapy %{_bindir}/UTscapy %{_bindir}/scapy3 %{_bindir}/UTscapy3 -%{python3_sitelib}/scapy/* +%{python3_sitelib}/scapy/ %{python3_sitelib}/scapy-*.egg-info %changelog +* Fri Sep 20 2019 Miro Hrončok - 2.4.0-8 +- Subpackage python2-scapy has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Mon Aug 19 2019 Miro Hrončok - 2.4.0-7 - Rebuilt for Python 3.8