From 8028a88cf5276446225a05c90974bb4c73eb91ba Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 1 Apr 2023 12:03:21 -0700
Subject: [PATCH] Update to 1.0.7. Fixes rhbz#2155658

Build the package with setuptools instead of distutils. Fixes: rhbz#2154872
---
 .gitignore    |  1 +
 nftables.spec | 15 ++++++++++++---
 sources       |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5c51fd6..c5937f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /nftables-1.0.1.tar.bz2
 /nftables-1.0.4.tar.bz2
 /nftables-1.0.5.tar.bz2
+/nftables-1.0.7.tar.xz
diff --git a/nftables.spec b/nftables.spec
index 7deab27..e067a84 100644
--- a/nftables.spec
+++ b/nftables.spec
@@ -1,13 +1,13 @@
 Name:           nftables
-Version:        1.0.5
-Release:        2%{?dist}
+Version:        1.0.7
+Release:        1%{?dist}
 # Upstream released a 0.100 version, then 0.4. Need Epoch to get back on track.
 Epoch:          1
 Summary:        Netfilter Tables userspace utilites
 
 License:        GPLv2
 URL:            https://netfilter.org/projects/nftables/
-Source0:        %{url}/files/%{name}-%{version}.tar.bz2
+Source0:        %{url}/files/%{name}-%{version}.tar.xz
 Source1:        nftables.service
 Source2:        nftables.conf
 Source3:        main.nft
@@ -32,6 +32,7 @@ BuildRequires: jansson-devel
 BuildRequires: python3-devel
 BuildRequires: readline-devel
 BuildRequires: libedit-devel
+BuildRequires: python3-setuptools
 
 %description
 Netfilter Tables userspace utilities.
@@ -54,6 +55,10 @@ The nftables python module provides an interface to libnftables via ctypes.
 
 %prep
 %autosetup -p1
+# upstream: https://git.netfilter.org/nftables/commit/py?id=1acc2fd48c755a8931fa87b8d0560b750316059f
+sed -i 's/distutils.core/setuptools/' py/setup.py
+# this part is downstream only and prevents setuptools from installing an egg:
+sed -i 's/--prefix $(DESTDIR)$(prefix)/--root $(DESTDIR) --prefix $(prefix)/' py/Makefile*
 
 %build
 #./autogen.sh
@@ -125,6 +130,10 @@ sed -i -e 's/\(sofile=\)".*"/\1"'$sofile'"/' \
 %{python3_sitelib}/nftables/
 
 %changelog
+* Sat Apr 01 2023 Kevin Fenzi <kevin@scrye.com> - 1.0.7-1
+- Update to 1.0.7. Fixes rhbz#2155658
+- Build the package with setuptools instead of distutils. Fixes: rhbz#2154872
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 714f641..301d744 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nftables-1.0.5.tar.bz2) = 51cbf10579db7eed58f4358044840f2ce1bffe84533c5fb03e0ebcc702970856455576ac793169c94d38a9f8148e33631ad91444e54a8be189d93af7c27feb9a
+SHA512 (nftables-1.0.7.tar.xz) = 063f3a42327fd4dca9214314c7e7bcc7310f2ccbbce4c36f86a291d61d443f94b0f91435ecd04eb757596df8be91a802daeef394ba422c3623a81b2917e01116