From 18a59bedcc9555dbe39db1ff7af3ff87625192b8 Mon Sep 17 00:00:00 2001
From: Vit Mojzis <vmojzis@redhat.com>
Date: Tue, 9 Sep 2025 10:23:26 +0200
Subject: [PATCH] SETools 4.6.0

Also drop redundant runtime requirement on python3-setuptools
based on:
https://src.fedoraproject.org/rpms/setools/c/f5e19e21ecbb28266d998912873ecd84941c4409
https://src.fedoraproject.org/rpms/setools/c/17706eb7801657c220598912658cec2db91ce010
https://src.fedoraproject.org/rpms/setools/c/c0cc824e8f96e82071b6cf6d3070b0984a939347

Resolves: RHEL-115363
---
 .gitignore   |  1 +
 156.patch    | 43 +++++++++++++++++++++++++++++++++++++++++++
 setools.spec | 12 +++++++++---
 sources      |  2 +-
 4 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 156.patch

diff --git a/.gitignore b/.gitignore
index ee1b313..b838721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ setools-3.3.8-f1e5b20.tar.bz2
 /4.4.4.tar.gz
 /4.5.0.tar.gz
 /4.5.1.tar.gz
+/4.6.0.tar.gz
diff --git a/156.patch b/156.patch
new file mode 100644
index 0000000..ea56fc1
--- /dev/null
+++ b/156.patch
@@ -0,0 +1,43 @@
+From 39f7c88251925463c38f5000f6178fe70b484f44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 8 Apr 2025 11:22:47 +0200
+Subject: [PATCH] Remove redundant runtime requirement on setuptools
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The dependency was dropped in 99a1cf3b50cd8bf502b5070293c4d1bf792d1566
+
+Add a build time dependency for setup.py build_ext on Python 3.12+
+which no longer contains distutils.
+
+Signed-off-by: Miro Hrončok <miro@hroncok.cz>
+---
+ pyproject.toml | 2 +-
+ tox.ini        | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index f7815a15..28ae121a 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -39,7 +39,7 @@ classifiers = ["Development Status :: 5 - Production/Stable",
+ 
+ requires-python=">=3.10"
+ # also requires libsepol.so and libselinux.so.
+-dependencies = ["setuptools"]
++dependencies = []
+ 
+ optional-dependencies.analysis = ["networkx>=2.6",
+                                   "pygraphviz"]
+diff --git a/tox.ini b/tox.ini
+index 8fa6954f..b2a21d6b 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -56,5 +56,6 @@ deps            = networkx>=2.6
+                   pygraphviz
+                   pytest-qt
+                   pytest-xvfb
++                  setuptools;python_version>="3.12"
+ commands_pre    = {envpython} setup.py build_ext -i
+ commands        = {envpython} -m pytest tests
diff --git a/setools.spec b/setools.spec
index 64c9fc5..3096dc8 100644
--- a/setools.spec
+++ b/setools.spec
@@ -2,8 +2,8 @@
 %global selinux_ver 3.9
 
 Name:           setools
-Version:        4.5.1
-Release:        5%{?dist}
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        Policy analysis tools for SELinux
 
 License:        GPL-2.0-only AND LGPL-2.1-only
@@ -12,6 +12,9 @@ Source0:        https://github.com/SELinuxProject/setools/archive/%{version}.tar
 Source1:        setools.pam
 Source2:        apol.desktop
 
+# Remove redundant runtime requirement on setuptools
+Patch:          https://github.com/SELinuxProject/setools/pull/156.patch
+
 Obsoletes:      setools < 4.0.0, setools-devel < 4.0.0
 BuildRequires:  flex,  bison
 BuildRequires:  glibc-devel, gcc, git-core
@@ -67,7 +70,6 @@ This package includes the following console tools:
 Summary:     Policy analysis tools for SELinux
 License:     LGPL-2.1-only
 Obsoletes:   setools-libs < 4.0.0
-Requires:    python3-setuptools
 
 %description -n python3-setools
 SETools is a collection of graphical tools, command-line tools, and
@@ -146,6 +148,10 @@ Python modules designed to facilitate SELinux policy analysis.
 %{_mandir}/ru/man1/apol*
 
 %changelog
+* Thu Oct 23 2025 Vit Mojzis <vmojzis@redhat.com> - 4.6.0-1
+- SETools 4.6.0
+- Drop redundant runtime requirement on python3-setuptools (redux)
+
 * Wed Jul 23 2025 Vit Mojzis <vmojzis@redhat.com> - 4.5.1-5
 - Rebuild for SELinux userspace 3.9 (RHEL-104006)
 
diff --git a/sources b/sources
index fa454b3..386b801 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (4.5.1.tar.gz) = 6aef2e12495f980a0b71cf888170ee2f1de94785404b578d416d9720f2441ff3ef14c7ac434310e421c7fa885b8c8ef99aff6438ecfb5e8687d0ff4875127824
+SHA512 (4.6.0.tar.gz) = 5b654f480f285717d15fa55f754fbd00cb030a0d8af8342d901e0514c4fdbacb7873e19420dab98540eaa481c687ff1e03423df893c0d1744eb4c53eb81afbf5