From e0e1d6f94dd16c8066be8ce3c75ef306890a3e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Wed, 28 Jul 2021 18:47:02 +0200 Subject: [PATCH] freeipa.spec.in: remove python3-pexpect from Requires MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit python3-pexpect will be removed in RHEL9. Update BuildRequires/Requires accordingly. Fixes: https://pagure.io/freeipa/issue/8938 Signed-off-by: François Cami Reviewed-By: Rob Crittenden Reviewed-By: Antonio Torres --- freeipa.spec.in | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index c33d2e216..9440f3602 100755 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -328,11 +328,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 @@ -357,7 +364,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 @@ -878,11 +884,11 @@ Requires: python3-ipaclient = %{version}-%{release} Requires: python3-ipaserver = %{version}-%{release} Requires: iptables 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 -- 2.31.1