From 429a4d27a82a86b2681fa7813c5b8572f29079b1 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Jun 2021 09:12:17 +0200 Subject: [PATCH] Use more precise regular expression for python shebangs Resolves: bz#1969433 --- macros.qt5 | 42 +++++++++++++++++++++--------------------- qt5.spec | 8 ++++++-- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index 4fd6800..6e19a61 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -38,24 +38,24 @@ make sub-tests %{?_smp_mflags} -k ||: %qt5_install_tests \ - mkdir -p %{buildroot}%{_qt5_libdir}/qt5 \ - find ./tests -not -path '*/\.*' -type d | while read LINE \ - do \ - mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" \ - done \ - find ./tests -not -path '*/\.*' \\\ - -not -name '*.h' \\\ - -not -name '*.cpp' \\\ - -not -name '*.pro' \\\ - -not -name 'uic_wrapper.sh' \\\ - -not -name 'target_wrapper.sh' \\\ - -not -name 'Makefile' \\\ - -type f | while read LINE \ - do \ - if grep --quiet "#\\!\\ */usr/bin/env\\ python\\|#\\!/usr/bin/python" "$LINE" \ - then \ - sed -i s@\\/usr\\/bin\\/python@\\/usr\\/bin\\/python3@ "$LINE" \ - sed -i s@\\/usr\\/bin\\/env\\ python@\\/usr\\/bin\\/python3@ "$LINE" \ - fi \ - cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ \ - done \ + mkdir -p %{buildroot}%{_qt5_libdir}/qt5 \ + find ./tests -not -path '*/\.*' -type d | while read LINE \ + do \ + mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" \ + done \ + find ./tests -not -path '*/\.*' \\\ + -not -name '*.h' \\\ + -not -name '*.cpp' \\\ + -not -name '*.pro' \\\ + -not -name 'uic_wrapper.sh' \\\ + -not -name 'target_wrapper.sh' \\\ + -not -name 'Makefile' \\\ + -type f | while read LINE \ + do \ + if grep --quiet "#\\!\\ */usr/bin/env\\ python\\|#\\!/usr/bin/python$" "$LINE" \ + then \ + sed -i s@\\/usr\\/bin\\/python\\$@\\/usr\\/bin\\/python3@ "$LINE" \ + sed -i s@\\/usr\\/bin\\/env\\ python@\\/usr\\/bin\\/python3@ "$LINE" \ + fi \ + cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ \ + done \ diff --git a/qt5.spec b/qt5.spec index a3c4413..8f09082 100644 --- a/qt5.spec +++ b/qt5.spec @@ -6,7 +6,7 @@ Name: qt5 Version: 5.15.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt5 meta package License: GPLv3 URL: https://getfedora.org/ @@ -141,7 +141,11 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %changelog -* Thu Jun 10 2021 Jan Grulich - 5.15.2-5 +* Fri Jun 11 2021 Jan Grulich - 5.15.2-7 +- Use more precise regular expression for python shebangs + Resolves: bz#1969433 + +* Thu Jun 10 2021 Jan Grulich - 5.15.2-6 - Handle additional spaces python shebangs Resolves: bz#1969433