]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: use rpm macro for python shebang pathfix 65752/head
authorJohn Mulligan <jmulligan@redhat.com>
Thu, 13 Feb 2025 20:59:42 +0000 (15:59 -0500)
committerCasey Bodley <cbodley@redhat.com>
Wed, 1 Oct 2025 21:12:58 +0000 (17:12 -0400)
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 <jmulligan@redhat.com>
(cherry picked from commit f60065de25322505c3d95a38148f7e7506fe65bc)

ceph.spec.in

index 4ab5f3a102a81c73f72624183a243dd1802ed293..226fe72192bd6dc28937b15b61fcf8f58c67265a 100644 (file)
@@ -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