diff --git a/SOURCES/macros.qt5 b/SOURCES/macros.qt5 index 16cb15c..ab4a483 100644 --- a/SOURCES/macros.qt5 +++ b/SOURCES/macros.qt5 @@ -33,31 +33,3 @@ %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 \ diff --git a/SOURCES/macros.qt5-srpm b/SOURCES/macros.qt5-srpm index 632755c..7fab15e 100644 --- a/SOURCES/macros.qt5-srpm +++ b/SOURCES/macros.qt5-srpm @@ -5,5 +5,5 @@ # # 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 +%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el riscv64 diff --git a/SPECS/qt5.spec b/SPECS/qt5.spec index c6733f9..33caab2 100644 --- a/SPECS/qt5.spec +++ b/SPECS/qt5.spec @@ -5,15 +5,15 @@ %endif Name: qt5 -Version: 5.15.9 +# This version MUST remain in sync with Qt5 versions! +Version: 5.15.15 Release: 1%{?dist} Summary: Qt5 meta package -License: GPLv3 -URL: https://getfedora.org/ +License: GPL-3.0-only +URL: https://getfedora.org/ Source0: macros.qt5 Source1: macros.qt5-srpm Source2: qmake-qt5.sh -BuildArch: noarch Requires: qt5-qdbusviewer Requires: qt5-qt3d @@ -88,16 +88,38 @@ Requires: cmake >= 3 Requires: cmake3 %endif Requires: gcc-c++ +BuildArch: noarch %description rpm-macros %{summary}. %package srpm-macros Summary: RPM macros for source Qt5 packages +BuildArch: noarch %description srpm-macros %{summary}. +%package filesystem +Summary: Filesystem for Qt 5 packages +%description filesystem +Filesystem for Qt 5 packages. %install +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5 +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/bin +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/cmake +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/examples +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/imports +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/metatypes +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/modules +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/libexec +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/mkspecs +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins +mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/qml +mkdir -p %{buildroot}%{_datadir}/qt5 +mkdir -p %{buildroot}%{_docdir}/qt5 +mkdir -p %{buildroot}%{_includedir}/qt5 +mkdir -p %{buildroot}%{_datadir}/qt5/translations + install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt5.sh @@ -139,42 +161,113 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %files srpm-macros %{_rpmconfigdir}/macros.d/macros.qt5-srpm +%files filesystem +%dir %{_prefix}/lib/qt5 +%dir %{_prefix}/%{_lib}/qt5 +%dir %{_prefix}/lib/qt5/bin +%dir %{_prefix}/%{_lib}/qt5/bin +%dir %{_prefix}/lib/qt5/cmake +%dir %{_prefix}/%{_lib}/qt5/cmake +%dir %{_prefix}/lib/qt5/examples +%dir %{_prefix}/%{_lib}/qt5/examples +%dir %{_prefix}/lib/qt5/imports +%dir %{_prefix}/%{_lib}/qt5/imports +%dir %{_prefix}/lib/qt5/metatypes +%dir %{_prefix}/%{_lib}/qt5/metatypes +%dir %{_prefix}/lib/qt5/modules +%dir %{_prefix}/%{_lib}/qt5/modules +%dir %{_prefix}/lib/qt5/libexec +%dir %{_prefix}/%{_lib}/qt5/libexec +%dir %{_prefix}/lib/qt5/mkspecs +%dir %{_prefix}/%{_lib}/qt5/mkspecs +%dir %{_prefix}/lib/qt5/plugins +%dir %{_prefix}/%{_lib}/qt5/plugins +%dir %{_prefix}/lib/qt5/qml +%dir %{_prefix}/%{_lib}/qt5/qml +%dir %{_datadir}/qt5 +%dir %{_docdir}/qt5 +%dir %{_includedir}/qt5 +%dir %{_datadir}/qt5/translations + %changelog -* Mon Apr 17 2023 Jan Grulich - 5.15.9-1 +* Mon Dec 23 2024 Arkady L. Shane - 5.15.15-1 +- Rebuilt for MSVSphere 10 + +* Wed Sep 04 2024 Jan Grulich - 5.15.15-1 +- 5.15.15 + +* Fri Jul 19 2024 Fedora Release Engineering - 5.15.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Jan Grulich - 5.15.14-2 +- Introduce qt5-filesystem package + +* Wed May 29 2024 Jan Grulich - 5.15.14-1 +- 5.15.14 + +* Mon May 06 2024 Liu Yang - 5.15.13-2 +- Add riscv64 to macro %qt5_qtwebengine_arches. + +* Mon Mar 11 2024 Jan Grulich - 5.15.13-1 +- 5.15.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 5.15.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 5.15.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Jan 02 2024 Jan Grulich - 5.15.12-1 +- 5.15.12 + +* Sun Oct 08 2023 Jan Grulich - 5.15.11-1 +- 5.15.11 + +* Fri Oct 06 2023 Jan Grulich - 5.15.10-3 +- 5.15.11 + +* Fri Jul 21 2023 Fedora Release Engineering - 5.15.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Jun 12 2023 Jan Grulich - 5.15.10-1 +- 5.15.10 + +* Tue Apr 11 2023 Jan Grulich - 5.15.9-1 - 5.15.9 - Resolves: bz#2175724 -* Thu Mar 24 2022 Jan Grulich - 5.15.3-1 -- 5.15.3 - Resolves: bz#2061352 +* Tue Jan 31 2023 Jan Grulich - 5.15.8-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 5.15.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Tue Aug 10 2021 Mohan Boddu - 5.15.2-9 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Thu Jan 05 2023 Jan Grulich - 5.15.8-1 +- 5.15.8 -* Tue Jun 15 2021 Jan Grulich - 5.15.2-8 -- Use more robust regular expressions - Resolves: bz#1969433 +* Mon Oct 31 2022 Jan Grulich - 5.15.7-1 +- 5.15.7 -* Fri Jun 11 2021 Jan Grulich - 5.15.2-7 -- Use more precise regular expression for python shebangs - Resolves: bz#1969433 +* Tue Sep 20 2022 Jan Grulich - 5.15.6-1 +- 5.15.6 -* Thu Jun 10 2021 Jan Grulich - 5.15.2-6 -- Handle additional spaces python shebangs - Resolves: bz#1969433 +* Sat Jul 23 2022 Fedora Release Engineering - 5.15.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Thu Jun 10 2021 Jan Grulich - 5.15.2-5 -- Let qt5_install_tests macro to handle mangling python shebangs - Resolves: bz#1969433 +* Wed Jul 13 2022 Jan Grulich - 5.15.5-1 +- 5.15.5 + +* Mon May 16 2022 Jan Grulich - 5.15.4-1 +- 5.15.4 + +* Fri Mar 04 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 -* Tue Jun 08 2021 Jan Grulich - 5.15.2-4 -- Add support for building upstream tests for gating - Resolves: bz#1969433 +* Fri Jan 21 2022 Fedora Release Engineering - 5.15.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 5.15.2-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Fri Jul 23 2021 Fedora Release Engineering - 5.15.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Wed Jan 27 2021 Fedora Release Engineering - 5.15.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild