Fix a regression in the %pytest definition

/usr/bin/pytest does not exist in RHEL 8, only /usr/bin/pytest-3
epel8
Miro Hrončok 2 years ago
parent e3b1254b4b
commit fcd61e6767

@ -1,6 +1,6 @@
Name: epel-rpm-macros Name: epel-rpm-macros
Version: 8 Version: 8
Release: 30 Release: 31
Summary: Extra Packages for Enterprise Linux RPM macros Summary: Extra Packages for Enterprise Linux RPM macros
License: GPLv2 License: GPLv2
@ -108,6 +108,9 @@ install -Dpm 644 %{SOURCE150} \
%changelog %changelog
* Sat Jul 16 2022 Miro Hrončok <mhroncok@redhat.com> - 8-31
- Fix a regression in the %%pytest definition (/usr/bin/pytest: No such file or directory)
* Tue May 24 2022 Maxwell G <gotmax@e.email> - 8-30 * Tue May 24 2022 Maxwell G <gotmax@e.email> - 8-30
- Pull in appropriate python3X-rpm-macros package for non-default Python - Pull in appropriate python3X-rpm-macros package for non-default Python
versions versions

@ -14,7 +14,7 @@
# RHEL 8's %%pytest does not work properly on non-default Python versions. # RHEL 8's %%pytest does not work properly on non-default Python versions.
# Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide # Backported from https://src.fedoraproject.org/rpms/python-rpm-macros/c/02536540768555dde6d675935db45df81bcab7bf?branch=rawhide
# https://bugzilla.redhat.com/show_bug.cgi?id=2091462 # https://bugzilla.redhat.com/show_bug.cgi?id=2091462
%__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 || echo -%{python3_version}) %__pytest /usr/bin/pytest%(test %{python3_pkgversion} == 3 && echo -3 || echo -%{python3_version})
# RHEL 8's %%py3_dist does not work properly on non-default Python versions. # RHEL 8's %%py3_dist does not work properly on non-default Python versions.
# This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1 # This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1

Loading…
Cancel
Save