From c4caa41827396befb7c995b9e53537395dbd7c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Mon, 1 Dec 2025 20:06:23 +0100
Subject: [PATCH] Fix installability conflict on python subpackage

Old version of 9.16.23 had dist-egg a simple file. New package should it
have a simple file too. Do not use prefer setuptools.

Resolves: RHEL-6454
---
 bind-9.16-python-isc-distutils.patch | 34 ++++++++++++++++++++++++++++
 bind.spec                            |  7 +++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 bind-9.16-python-isc-distutils.patch

diff --git a/bind-9.16-python-isc-distutils.patch b/bind-9.16-python-isc-distutils.patch
new file mode 100644
index 0000000..e36ca8c
--- /dev/null
+++ b/bind-9.16-python-isc-distutils.patch
@@ -0,0 +1,34 @@
+From ebedaa79b93dfcb4f41169095ae02f59dedb3fa1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
+Date: Tue, 2 Dec 2025 17:29:59 +0100
+Subject: [PATCH] Swap order of tried setuptools providers
+
+Older distutils.core will generate only a single file, not whole
+directory. That is needed for upgrade test. For newer distributions,
+setuptools should still work.
+
+To keep backward compatibility with 9.16.23, prefer distutils.
+---
+ bin/python/setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/python/setup.py b/bin/python/setup.py
+index 4440b74..dc96561 100644
+--- a/bin/python/setup.py
++++ b/bin/python/setup.py
+@@ -10,10 +10,10 @@
+ # information regarding copyright ownership.
+ 
+ try:
+-    from setuptools import setup
+-except ImportError:
+     # pylint: disable=deprecated-module
+     from distutils.core import setup
++except ImportError:
++    from setuptools import setup
+ 
+ setup(
+     name="isc",
+-- 
+2.52.0
+
diff --git a/bind.spec b/bind.spec
index eae0e39..6c43c31 100644
--- a/bind.spec
+++ b/bind.spec
@@ -54,7 +54,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.50
-Release:  1%{?dist}
+Release:  2%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -160,6 +160,8 @@ Patch230: bind-9.16-CVE-2026-3039.patch
 # https://gitlab.isc.org/isc-projects/bind9/-/commit/ec2c98181115bd5f6c7087fcc74d816490d4312e
 # https://gitlab.isc.org/isc-projects/bind9/-/commit/e5abd37cb2330af1fbfeba68eb32f2873390226d
 Patch231: bind-9.16-CVE-2026-5946.patch
+# downstream only. Do not conflict on upgrade, egg-info should be a file
+Patch232: bind-9.16-python-isc-distutils.patch
 
 %{?systemd_ordering}
 # https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers
@@ -1217,6 +1219,9 @@ fi;
 %endif
 
 %changelog
+* Mon Mar 16 2026 Petr Menšík <pemensik@redhat.com> - 32:9.16.50-2
+- Use the distutils for python, for backward compatibility
+
 * Mon Mar 16 2026 Petr Menšík <pemensik@redhat.com> - 32:9.16.50-1
 - Update to 9.16.50 (RHEL-6454)
 - Allow starting without inline-signing and dnssec-policy