Do not patch out patchelf in a future EPEL10, only in RHEL

[skip changelog]
This commit is contained in:
Benjamin A. Beasley 2024-06-10 19:26:36 -04:00 committed by Pavel Simovec
parent c88688dc68
commit 281defd308

View File

@ -42,7 +42,7 @@ Summary: %{summary}
# When patchelf is not in the PATH, mesonpy.get_requires_for_build_wheel() adds # 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 # https://pypi.org/project/patchelf/ to the dependencies. We always want to use
# the system patchelf. # the system patchelf.
%if 0%{?rhel} == 0 %if 0%{?epel} || !0%{?rhel}
BuildRequires: /usr/bin/patchelf BuildRequires: /usr/bin/patchelf
Requires: /usr/bin/patchelf Requires: /usr/bin/patchelf
%endif %endif
@ -57,7 +57,7 @@ Requires: /usr/bin/patchelf
%setup -n meson_python-%{version} -q %setup -n meson_python-%{version} -q
%patch 0 -p1 %patch 0 -p1
%patch 1 -p1 %patch 1 -p1
%if 0%{?rhel} %if !0%{?epel} && 0%{?rhel}
%patch 2 -p1 %patch 2 -p1
%endif %endif
# build: used only by skipped PEP 518 test # 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_invalid_build_dir"
k="${k-}${k+ and }not test_use_ansi_colors" k="${k-}${k+ and }not test_use_ansi_colors"
%endif %endif
%if 0%{?rhel} %if !0%{?epel} && 0%{?rhel}
k="${k-}${k+ and }not test_contents" k="${k-}${k+ and }not test_contents"
k="${k-}${k+ and }not test_local_lib" k="${k-}${k+ and }not test_local_lib"
k="${k-}${k+ and }not test_rpath" k="${k-}${k+ and }not test_rpath"