From 933c560d30f391559861d79ebfdc210ab088a038 Mon Sep 17 00:00:00 2001
From: jonathanspw <jonathan@almalinux.org>
Date: Mon, 2 Jan 2023 13:30:22 -0600
Subject: [PATCH] update to 2.5.0 rhbz#2156396

---
 .gitignore |  1 +
 scapy.spec | 17 +++++++----------
 sources    |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6be0208..2d734b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ scapy-2.0.0.10.tar.gz
 /scapy-2.4.3.tar.gz
 /scapy-2.4.4.tar.gz
 /scapy-2.4.5.tar.gz
+/scapy-2.5.0.tar.gz
diff --git a/scapy.spec b/scapy.spec
index acd3db0..7089ae3 100644
--- a/scapy.spec
+++ b/scapy.spec
@@ -1,6 +1,6 @@
 Name:           scapy
-Version:        2.4.5
-Release:        6%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 Summary:        Interactive packet manipulation tool and network scanner
 
 %global         gituser         secdev
@@ -160,12 +160,10 @@ rm -f %{buildroot}%{python2_sitelib}/*egg-info/requires.txt
 
 # Rename the executables
 mv -f %{buildroot}%{_bindir}/scapy   %{buildroot}%{_bindir}/scapy2
-mv -f %{buildroot}%{_bindir}/UTscapy %{buildroot}%{_bindir}/UTscapy2
 
 %if ! 0%{?with_python3}
 # Link the default to the py2 version of executables if py3 not built
 ln -s %{_bindir}/scapy2   %{buildroot}%{_bindir}/scapy
-ln -s %{_bindir}/UTscapy2 %{buildroot}%{_bindir}/UTscapy
 %endif
 %endif
 
@@ -175,11 +173,9 @@ rm -f %{buildroot}%{python3_sitelib}/*egg-info/requires.txt
 
 # Rename the executables
 mv -f %{buildroot}%{_bindir}/scapy   %{buildroot}%{_bindir}/scapy3
-mv -f %{buildroot}%{_bindir}/UTscapy %{buildroot}%{_bindir}/UTscapy3
 
 # Link the default to the python3 version of executables
 ln -s %{_bindir}/scapy3   %{buildroot}%{_bindir}/scapy
-ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
 %endif
 
 
@@ -198,12 +194,11 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
 %if ! 0%{?with_python3}
 %doc %{_mandir}/man1/scapy.1*
 %{_bindir}/scapy
-%{_bindir}/UTscapy
 %endif
 %{_bindir}/scapy2
-%{_bindir}/UTscapy2
 %{python2_sitelib}/scapy/
 %{python2_sitelib}/scapy-*.egg-info
+%exclude %{python2_sitelib}/test/
 %endif
 
 
@@ -213,11 +208,10 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
 %license LICENSE
 %doc %{_mandir}/man1/scapy.1*
 %{_bindir}/scapy
-%{_bindir}/UTscapy
 %{_bindir}/scapy3
-%{_bindir}/UTscapy3
 %{python3_sitelib}/scapy/
 %{python3_sitelib}/scapy-*.egg-info
+%exclude %{python3_sitelib}/test/
 %endif
 
 
@@ -228,6 +222,9 @@ ln -s %{_bindir}/UTscapy3 %{buildroot}%{_bindir}/UTscapy
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index fe763b5..8569bb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scapy-2.4.5.tar.gz) = b5ccd689f7bd4fbbb86921a35360b94ec7a738b494f16e4764828689835296016bc476825add798406e4d32761d8df90b41ce7e38049afdabf98397b1bf5982a
+SHA512 (scapy-2.5.0.tar.gz) = 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a