From fcd61e67672d7eaed795d7271756d28878529724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 16 Jul 2022 09:06:01 +0200 Subject: [PATCH] Fix a regression in the %pytest definition /usr/bin/pytest does not exist in RHEL 8, only /usr/bin/pytest-3 --- epel-rpm-macros.spec | 5 ++++- macros.zzz-epel-override | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 7440bdf..d6b3145 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 8 -Release: 30 +Release: 31 Summary: Extra Packages for Enterprise Linux RPM macros License: GPLv2 @@ -108,6 +108,9 @@ install -Dpm 644 %{SOURCE150} \ %changelog +* Sat Jul 16 2022 Miro Hrončok - 8-31 +- Fix a regression in the %%pytest definition (/usr/bin/pytest: No such file or directory) + * Tue May 24 2022 Maxwell G - 8-30 - Pull in appropriate python3X-rpm-macros package for non-default Python versions diff --git a/macros.zzz-epel-override b/macros.zzz-epel-override index 5c11cc8..d26c90e 100644 --- a/macros.zzz-epel-override +++ b/macros.zzz-epel-override @@ -14,7 +14,7 @@ # 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 # 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. # This is copied here from https://git.centos.org/rpms/python-rpm-macros/pull-request/1