From 281defd308f36b28c3d9641a1e3fd165f8f8e676 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 10 Jun 2024 19:26:36 -0400 Subject: [PATCH] Do not patch out patchelf in a future EPEL10, only in RHEL [skip changelog] --- python-meson-python.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-meson-python.spec b/python-meson-python.spec index ff79d11..b2e36bb 100644 --- a/python-meson-python.spec +++ b/python-meson-python.spec @@ -42,7 +42,7 @@ Summary: %{summary} # When patchelf is not in the PATH, mesonpy.get_requires_for_build_wheel() adds # https://pypi.org/project/patchelf/ to the dependencies. We always want to use # the system patchelf. -%if 0%{?rhel} == 0 +%if 0%{?epel} || !0%{?rhel} BuildRequires: /usr/bin/patchelf Requires: /usr/bin/patchelf %endif @@ -57,7 +57,7 @@ Requires: /usr/bin/patchelf %setup -n meson_python-%{version} -q %patch 0 -p1 %patch 1 -p1 -%if 0%{?rhel} +%if !0%{?epel} && 0%{?rhel} %patch 2 -p1 %endif # build: used only by skipped PEP 518 test @@ -92,7 +92,7 @@ ignore="${ignore-} --ignore=tests/test_pep518.py" k="${k-}${k+ and }not test_invalid_build_dir" k="${k-}${k+ and }not test_use_ansi_colors" %endif -%if 0%{?rhel} +%if !0%{?epel} && 0%{?rhel} k="${k-}${k+ and }not test_contents" k="${k-}${k+ and }not test_local_lib" k="${k-}${k+ and }not test_rpath"