rpms/qt5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use more precise regular expression for python shebangs

Browse Source 
Resolves: bz#1969433
This commit is contained in:
Jan Grulich 2021-06-11 09:12:17 +02:00
parent f2c74400df
commit 429a4d27a8
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
macros.qt5
View File

@ -38,24 +38,24 @@
make sub-tests %{?_smp_mflags} -k ||: make sub-tests %{?_smp_mflags} -k ||:
%qt5_install_tests \ %qt5_install_tests \
mkdir -p %{buildroot}%{_qt5_libdir}/qt5 \ mkdir -p %{buildroot}%{_qt5_libdir}/qt5 \
find ./tests -not -path '*/\.*' -type d | while read LINE \ find ./tests -not -path '*/\.*' -type d | while read LINE \
do \ do \
mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" \ mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE" \
done \ done \
find ./tests -not -path '*/\.*' \\\ find ./tests -not -path '*/\.*' \\\
-not -name '*.h' \\\ -not -name '*.h' \\\
-not -name '*.cpp' \\\ -not -name '*.cpp' \\\
-not -name '*.pro' \\\ -not -name '*.pro' \\\
-not -name 'uic_wrapper.sh' \\\ -not -name 'uic_wrapper.sh' \\\
-not -name 'target_wrapper.sh' \\\ -not -name 'target_wrapper.sh' \\\
-not -name 'Makefile' \\\ -not -name 'Makefile' \\\
-type f | while read LINE \ -type f | while read LINE \
do \ do \
if grep --quiet "#\\!\\ */usr/bin/env\\ python\\|#\\!/usr/bin/python" "$LINE" \ if grep --quiet "#\\!\\ */usr/bin/env\\ python\\|#\\!/usr/bin/python$" "$LINE" \
then \ then \
sed -i s@\\/usr\\/bin\\/python@\\/usr\\/bin\\/python3@ "$LINE" \ sed -i s@\\/usr\\/bin\\/python\\$@\\/usr\\/bin\\/python3@ "$LINE" \
sed -i s@\\/usr\\/bin\\/env\\ python@\\/usr\\/bin\\/python3@ "$LINE" \ sed -i s@\\/usr\\/bin\\/env\\ python@\\/usr\\/bin\\/python3@ "$LINE" \
fi \ fi \
cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ \ cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/ \
done \ done \

8
qt5.spec
View File

@ -6,7 +6,7 @@
Name: qt5 Name: qt5
Version: 5.15.2 Version: 5.15.2
Release: 6%{?dist} Release: 7%{?dist}
Summary: Qt5 meta package Summary: Qt5 meta package
License: GPLv3 License: GPLv3
URL: https://getfedora.org/ URL: https://getfedora.org/
@ -141,7 +141,11 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
%changelog %changelog
* Thu Jun 10 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-5 * Fri Jun 11 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-7
- Use more precise regular expression for python shebangs
Resolves: bz#1969433
* Thu Jun 10 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-6
- Handle additional spaces python shebangs - Handle additional spaces python shebangs
Resolves: bz#1969433 Resolves: bz#1969433