SOURCES/macros.qt5

@@ -33,3 +33,31 @@
 %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
 
 %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@
+
+%qt5_build_tests \
+  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[23]\\{1\\}\\|#\\!\\ */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\\ python2\\$@\\/usr\\/bin\\/python2@ "$LINE"     \
+          sed -i s@\\/usr\\/bin\\/env\\ python3\\$@\\/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                                                                                 \

SOURCES/macros.qt5-srpm

@@ -0,0 +1,9 @@
+
+# # the architectures theoretically supported by the version of V8 used (#1298011)
+# # You may need some minor patching to build on one of the secondary
+# # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations.
+# # If you cannot get this package to build on your secondary architecure, please:
+# # * remove your architecture from this list AND
+# # * put #1298011 onto your ExcludeArch tracker.
+%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el
+

SPECS/qt5.spec

@@ -1,12 +1,18 @@
+# include qt5,qt5-devel metapackages or not
+# dropped for f32+
+%if 0%{?fedora} < 32
+%global metapackage 1
+%endif
 
 Name: qt5
-Version: 5.15.3
+Version: 5.15.9
 Release: 1%{?dist}
 Summary: Qt5 meta package
 License: GPLv3
 URL: https://getfedora.org/
 Source0: macros.qt5
-Source1: qmake-qt5.sh
+Source1: macros.qt5-srpm
+Source2: qmake-qt5.sh
 BuildArch: noarch
 
 Requires: qt5-qdbusviewer
@@ -34,9 +40,6 @@ Requires: qt5-qtwebchannel
 ## qtwebengine is not available on all archs, omit for now
 ## else, need to make qt5 arch'd and deps conditional (on arch)
 #Requires: qt5-qtwebengine
-%if 0%{?fedora}
-Requires: qt5-qtwebkit
-%endif
 Requires: qt5-qtwebsockets
 Requires: qt5-qtx11extras
 Requires: qt5-qtxmlpatterns
@@ -67,10 +70,7 @@ Requires: qt5-qtsvg-devel
 Requires: qt5-qttools-devel
 Requires: qt5-qtwayland-devel
 Requires: qt5-qtwebchannel-devel
-%if 0%{?fedora}
 #Requires: qt5-qtwebengine-devel
-Requires: qt5-qtwebkit-devel
-%endif
 Requires: qt5-qtwebsockets-devel
 Requires: qt5-qtx11extras-devel
 Requires: qt5-qtxmlpatterns-devel
@@ -81,10 +81,10 @@ Requires: qt5-qtxmlpatterns-devel
 %package rpm-macros
 Summary: RPM macros for building Qt5 and KDE Frameworks 5 packages
 Conflicts: qt5-qtbase-devel < 5.6.0-0.23
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Requires: cmake >= 3
 %endif
-%if 0%{?epel}
+%if 0%{?rhel} && 0%{?rhel} < 8
 Requires: cmake3
 %endif
 Requires: gcc-c++
@@ -96,9 +96,11 @@ Summary: RPM macros for source Qt5 packages
 %description srpm-macros
 %{summary}.
 
+
 %install
 install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
-install -Dpm755 %{SOURCE1} %{buildroot}%{_bindir}/qmake-qt5.sh
+install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm
+install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt5.sh
 mkdir -p %{buildroot}%{_datadir}/qt5/wrappers
 ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake-qt5
 ln -s %{_bindir}/qmake-qt5.sh %{buildroot}%{_datadir}/qt5/wrappers/qmake
@@ -116,6 +118,7 @@ sed -i \
   -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
 
+%if 0%{?metapackage}
 mkdir -p %{buildroot}%{_docdir}/qt5
 mkdir -p %{buildroot}%{_docdir}/qt5-devel
 echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README
@@ -126,6 +129,7 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 
 %files devel
 %{_docdir}/qt5-devel/README
+%endif
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.qt5
@@ -133,45 +137,118 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 %{_datadir}/qt5/wrappers/
 
 %files srpm-macros
+%{_rpmconfigdir}/macros.d/macros.qt5-srpm
 
 
 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 5.15.3-1
+* Mon Apr 17 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
-- Rebuilt for MSVSphere 8.8
+- 5.15.9
+  Resolves: bz#2175724
 
 * Thu Mar 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
 - 5.15.3
-  Resolves: bz#2061377
+  Resolves: bz#2061352
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-9
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jun 15 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-8
+- Use more robust regular expressions
+  Resolves: bz#1969433
 
-* Mon Mar 29 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
+* 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
+  Resolves: bz#1969433
+
+* Thu Jun 10 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-5
+- Let qt5_install_tests macro to handle mangling python shebangs
+  Resolves: bz#1969433
+
+* Tue Jun 08 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-4
+- Add support for building upstream tests for gating
+  Resolves: bz#1969433
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Nov 20 08:56:04 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
 - 5.15.2
-  Resolves: bz#1928156
 
-* Mon Mar 29 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
 - 5.15.1
-  Resolves: bz#1928156
 
-* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-3
+* Wed Aug 19 2020 Troy Dawson <tdawson@redhat.com> - 5.14.2-5
-- Re-add srpm macros, just leave them empty
+- fix rpm-macros for RHEL builds
-  Resolves: bz#1733133
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-3
-- Drop srpm macros as we don't ship qtwebengine
+- drop qt5,qt5-devel metapackages f32+
-  Resolves: bz#1733133
 
-* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-2
-- 5.12.5 + sync with Fedora
+- qt5-devel: drop R: qt5-qtenginio-devel
-  Resolves: bz#1733133
 
-* Mon Jul 09 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
-- drop dependency on qt5-qtenginio
+- 5.14.2
+- drop qt5-qtwebkit from metapackage (hasn't been a core qt5 pkg for awhile)
 
-* Thu Jun 28 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-1
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
+- 5.13.2
+
+* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
+- 5.12.5
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jun 11 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1
+- 5.12.4
+
+* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
+- 5.12.3
+
+* Thu Feb 14 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
+- 5.12.1
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
+- 5.11.3
+
+* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
+- 5.11.2
+
+* Tue Aug 21 2018 Owen Taylor <otaylor@redhat.com> - 5.11.1-4
+- rpm-macros: always refer to binaries in their installed location, even if %%_libdir
+  and %%_bindir are redefined.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Jun 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-2
+- %%_qt5_prefix=%%_prefix (was %%_libdir/qt5}
+
+* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
 - 5.11.1
-- sync with Fedora and enable CMake in buildroot for RHEL
 
-* Mon May 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-2
+* Sat Jun 02 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-2
-- Require qt5-qtwebkit only for Fedora
+- rpm-macros: do not define _qt5_archdatadir, _qt5_bindir in terms of _qt5_prefix anymore
+
+* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
+- 5.11.0
 
 * Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-1
 - 5.10.1