Remove dependency on python3-pexpect on RHEL9.

Resolves: rhbz#1980734

Signed-off-by: François Cami <fcami@redhat.com>
This commit is contained in:
François Cami 2021-08-06 15:23:02 +02:00
parent 81c2724bff
commit 1b7159c02c

View File

@ -191,7 +191,7 @@
Name: %{package_name} Name: %{package_name}
Version: %{IPA_VERSION} 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 Summary: The Identity, Policy and Audit system
License: GPLv3+ License: GPLv3+
@ -318,11 +318,18 @@ BuildRequires: python3-m2r
# Build dependencies for lint and fastcheck # Build dependencies for lint and fastcheck
# #
%if %{with lint} %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+ # jsl is orphaned in Fedora 34+
%if 0%{?fedora} < 34
BuildRequires: jsl BuildRequires: jsl
%endif %endif
BuildRequires: git
BuildRequires: nss-tools BuildRequires: nss-tools
BuildRequires: rpmlint BuildRequires: rpmlint
BuildRequires: softhsm BuildRequires: softhsm
@ -347,7 +354,6 @@ BuildRequires: python3-lxml
BuildRequires: python3-netaddr >= %{python_netaddr_version} BuildRequires: python3-netaddr >= %{python_netaddr_version}
BuildRequires: python3-netifaces BuildRequires: python3-netifaces
BuildRequires: python3-paste BuildRequires: python3-paste
BuildRequires: python3-pexpect
BuildRequires: python3-pki >= %{pki_version} BuildRequires: python3-pki >= %{pki_version}
BuildRequires: python3-polib BuildRequires: python3-polib
BuildRequires: python3-pyasn1 BuildRequires: python3-pyasn1
@ -869,11 +875,11 @@ Requires: python3-ipaserver = %{version}-%{release}
Requires: iptables Requires: iptables
Requires: python3-coverage Requires: python3-coverage
Requires: python3-cryptography >= 1.6 Requires: python3-cryptography >= 1.6
Requires: python3-pexpect
%if 0%{?fedora} %if 0%{?fedora}
# These packages do not exist on RHEL and for ipatests use # These packages do not exist on RHEL and for ipatests use
# they are installed on the controller through other means # they are installed on the controller through other means
Requires: ldns-utils Requires: ldns-utils
Requires: python3-pexpect
# update-crypto-policies # update-crypto-policies
Requires: crypto-policies-scripts Requires: crypto-policies-scripts
Requires: python3-polib Requires: python3-polib
@ -1691,6 +1697,10 @@ fi
%endif %endif
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild