From 1b7159c02cb3d561ff372a13694f8f7944bb287d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= <fcami@redhat.com>
Date: Fri, 6 Aug 2021 15:23:02 +0200
Subject: [PATCH] Remove dependency on python3-pexpect on RHEL9. Resolves:
 rhbz#1980734
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Cami <fcami@redhat.com>
---
 freeipa.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/freeipa.spec b/freeipa.spec
index 16a05f7..48c9258 100644
--- a/freeipa.spec
+++ b/freeipa.spec
@@ -191,7 +191,7 @@
 
 Name:           %{package_name}
 Version:        %{IPA_VERSION}
-Release:        3%{?rc_version:.%rc_version}%{?dist}.1
+Release:        4%{?rc_version:.%rc_version}%{?dist}
 Summary:        The Identity, Policy and Audit system
 
 License:        GPLv3+
@@ -318,11 +318,18 @@ BuildRequires: python3-m2r
 # Build dependencies for lint and fastcheck
 #
 %if %{with lint}
-BuildRequires:  git
-%if 0%{?fedora} < 34
+
+# python3-pexpect might not be available in RHEL9
+%if 0%{?fedora} || 0%{?rhel} < 9
+BuildRequires:  python3-pexpect
+%endif
+
 # jsl is orphaned in Fedora 34+
+%if 0%{?fedora} < 34
 BuildRequires:  jsl
 %endif
+
+BuildRequires:  git
 BuildRequires:  nss-tools
 BuildRequires:  rpmlint
 BuildRequires:  softhsm
@@ -347,7 +354,6 @@ BuildRequires:  python3-lxml
 BuildRequires:  python3-netaddr >= %{python_netaddr_version}
 BuildRequires:  python3-netifaces
 BuildRequires:  python3-paste
-BuildRequires:  python3-pexpect
 BuildRequires:  python3-pki >= %{pki_version}
 BuildRequires:  python3-polib
 BuildRequires:  python3-pyasn1
@@ -869,11 +875,11 @@ Requires: python3-ipaserver = %{version}-%{release}
 Requires: iptables
 Requires: python3-coverage
 Requires: python3-cryptography >= 1.6
-Requires: python3-pexpect
 %if 0%{?fedora}
 # These packages do not exist on RHEL and for ipatests use
 # they are installed on the controller through other means
 Requires: ldns-utils
+Requires: python3-pexpect
 # update-crypto-policies
 Requires: crypto-policies-scripts
 Requires: python3-polib
@@ -1691,6 +1697,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 6 2021 François Cami <fcami@redhat.com> - 4.9.6-4
+- Remove dependency on python3-pexpect on RHEL9.
+- Resolves: rhbz#1980734
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.6-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild