From 6b32b4dc1b7e89e1c76f11aa1333c9f4d093d09356312fb2b4f23d260d1a6ccb Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Tue, 24 Nov 2020 20:13:12 +0000 Subject: [PATCH] Accepting request 850574 from home:bnavigator:branches:KDE:Qt5 - Fix shebang replacement in pyqt_install_examples gh#openSUSE/python-rpm-macros#66 OBS-URL: https://build.opensuse.org/request/show/850574 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-pyqt-rpm-macros?expand=0&rev=6 --- macros.pyqt | 5 +++-- python-pyqt-rpm-macros.changes | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/macros.pyqt b/macros.pyqt index 47d3c72..f2f514e 100644 --- a/macros.pyqt +++ b/macros.pyqt @@ -59,8 +59,9 @@ find %{buildroot}%{_libqt5_plugindir} -name '*pyqt5*.so' \\\ exdir=%{buildroot}%{_docdir}/%{$python_prefix}-%{1} \ mkdir -p $exdir \ cp -r examples $exdir/ \ -# Fix wrong-script-interpreter \ -find $exdir -name "*.py" -exec sed -i "1 s|^#!%{_bindir}/env python.*$|#!%{_bindir}/$python|" {} \\; \ +# Fix shebang. Depending on version of python-rpm-macros, expanded python could be basename or full path. \ +python_exec=$(which $python) \ +find $exdir -name "*.py" -exec sed -i "1 s|^#!%{_bindir}/env python.*$|#!${python_exec}|" {} \\; \ %fdupes $exdir \ } \ %{nil} diff --git a/python-pyqt-rpm-macros.changes b/python-pyqt-rpm-macros.changes index 26994f1..76e9e7c 100644 --- a/python-pyqt-rpm-macros.changes +++ b/python-pyqt-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 24 11:03:47 UTC 2020 - Benjamin Greiner + +- Fix shebang replacement in pyqt_install_examples + gh#openSUSE/python-rpm-macros#66 + ------------------------------------------------------------------- Thu Nov 5 11:15:04 UTC 2020 - Benjamin Greiner