diff --git a/ufw-0.35-distutils-setuptools.patch b/ufw-0.35-distutils-setuptools.patch deleted file mode 100644 index dd816ed..0000000 --- a/ufw-0.35-distutils-setuptools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ufw-0.35/setup.py 2016-02-18 06:26:44.000000000 +0100 -+++ ufw-0.35/setup.py.distutils-setuptools 2023-06-15 23:17:13.651168188 +0200 -@@ -26,8 +26,8 @@ - # - - from __future__ import print_function --from distutils.command.install import install as _install --from distutils.core import setup -+from setuptools.command.install import install as _install -+from setuptools import setup - import errno - import os - import re diff --git a/ufw.spec b/ufw.spec index fb021cd..9b5b419 100644 --- a/ufw.spec +++ b/ufw.spec @@ -1,9 +1,9 @@ Name: ufw Version: 0.35 -Release: 41%{?dist} +Release: 27%{?dist} Summary: Uncomplicated Firewall -License: GPL-3.0-only +License: GPLv3 URL: https://launchpad.net/%{name} Source0: https://launchpad.net/%{name}/%{version}/%{version}/+download/ufw-%{version}.tar.gz # systemd service file @@ -36,13 +36,10 @@ Patch6: ufw-0.35-python36.patch Patch7: ufw-0.35-permissions.patch # Don't prepend /usr/bin/env to sys.executable, which is always an absolute path Patch8: ufw-0.35-no-pointless-env.patch -# Switch to Python setuptools because Python 3.12 removed deprecated distutils -Patch9: ufw-0.35-distutils-setuptools.patch BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: iptables BuildRequires: gettext BuildRequires: systemd @@ -63,23 +60,17 @@ manipulating the firewall. %prep %setup -q -%patch -P0 -p1 -b .trans-dir -%patch -P1 -p1 -b .libexec-dir -%patch -P2 -p1 -b .default-enabled -%patch -P3 -p1 -b .default-allow-ssh -%patch -P4 -p1 -b .multicast +%patch0 -p1 -b .trans-dir +%patch1 -p1 -b .libexec-dir +%patch2 -p1 -b .default-enabled +%patch3 -p1 -b .default-allow-ssh +%patch4 -p1 -b .multicast rm -f profiles/*.multicast -%patch -P5 -p1 -b .additional-profiles +%patch5 -p1 -b .additional-profiles rm -f profiles/*.additional-profiles -%patch -P6 -p1 -b .python36 -%patch -P7 -p1 -b .permissions -%patch -P8 -p1 -b .no-pointless-env -%patch -P9 -p1 -b .distutils-setuptools - -%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11 -# Unify /usr/bin and /usr/sbin -sed -e "s/'sbin'/'bin'/" -i setup.py -%endif +%patch6 -p1 -b .python36 +%patch7 -p1 -b .permissions +%patch8 -p1 -b .no-pointless-env %build %py3_build @@ -130,48 +121,6 @@ install -D -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/ufw.service %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.35-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Wed Jun 03 2026 Python Maint - 0.35-40 -- Rebuilt for Python 3.15 - -* Sat Jan 17 2026 Fedora Release Engineering - 0.35-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Sep 19 2025 Python Maint - 0.35-38 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 0.35-37 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 0.35-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 0.35-35 -- Rebuilt for Python 3.14 - -* Sun Jan 19 2025 Fedora Release Engineering - 0.35-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.35-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 0.35-32 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering - 0.35-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.35-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Robert Scheck - 0.35-29 -- Switch from deprecated distutils to setuptools for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 0.35-28 -- Rebuilt for Python 3.12 - * Sat Jan 21 2023 Fedora Release Engineering - 0.35-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild