From 0a8676911e2cf7d521ecd99988f71064cfa805a1 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 13 Feb 2025 15:59:42 -0500 Subject: [PATCH] ceph.spec.in: use rpm macro for python shebang pathfix To support EL 10 distros, update the source of the pathfix tool (on EL 9+ distros) and use the macro for updating python shebangs that has been available since at least EL 9. Signed-off-by: John Mulligan (cherry picked from commit f60065de25322505c3d95a38148f7e7506fe65bc) --- ceph.spec.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 4ab5f3a102a..226fe72192b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -495,8 +495,8 @@ BuildRequires: libcryptopp-devel BuildRequires: libnuma-devel %endif %endif -%if 0%{?rhel} >= 8 -BuildRequires: /usr/bin/pathfix.py +%if 0%{?rhel} >= 9 +BuildRequires: python-rpm-macros %endif %description @@ -1603,8 +1603,7 @@ install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules install -m 0440 -D sudoers.d/ceph-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-smartctl %if 0%{?rhel} >= 8 || 0%{?openEuler} -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* -pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_sbindir}/* +%{py3_shebang_fix} %{buildroot}%{_bindir}/* %{buildroot}%{_sbindir}/* %endif #set up placeholder directories -- 2.39.5