5.15.18

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

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
 

qt5.spec

@@ -1,14 +1,19 @@
+# include qt5,qt5-devel metapackages or not
+# dropped for f32+
+%if 0%{?fedora} < 32
+%global metapackage 1
+%endif
 
 Name: qt5
-Version: 5.13.2
+# This version MUST remain in sync with Qt5 versions!
+Version: 5.15.18
 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
@@ -35,7 +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
-Requires: qt5-qtwebkit
 Requires: qt5-qtwebsockets
 Requires: qt5-qtx11extras
 Requires: qt5-qtxmlpatterns
@@ -57,7 +61,6 @@ Requires: qt5-qt3d-devel
 Requires: qt5-qtbase-devel
 Requires: qt5-qtconnectivity-devel
 Requires: qt5-qtdeclarative-devel
-Requires: qt5-qtenginio-devel
 Requires: qt5-qtlocation-devel
 Requires: qt5-qtmultimedia-devel
 Requires: qt5-qtscript-devel
@@ -68,7 +71,6 @@ Requires: qt5-qttools-devel
 Requires: qt5-qtwayland-devel
 Requires: qt5-qtwebchannel-devel
 #Requires: qt5-qtwebengine-devel
-Requires: qt5-qtwebkit-devel
 Requires: qt5-qtwebsockets-devel
 Requires: qt5-qtx11extras-devel
 Requires: qt5-qtxmlpatterns-devel
@@ -79,23 +81,45 @@ 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}
+%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++
+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
@@ -116,6 +140,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 +151,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
@@ -135,8 +161,154 @@ 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
+* Tue Nov 04 2025 Jan Grulich <jgrulich@redhat.com> - 5.15.18-1
+- 5.15.18
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon May 26 2025 Jan Grulich <jgrulich@redhat.com> - 5.15.17-1
+- 5.15.17
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan 09 2025 Zephyr Lykos <fedora@mochaa.ws> - 5.15.16-1
+- 5.15.16
+
+* Wed Sep 04 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.15-1
+- 5.15.15
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jul 15 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.14-2
+- Introduce qt5-filesystem package
+
+* Wed May 29 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.14-1
+- 5.15.14
+
+* Mon May 06 2024 Liu Yang <Yang.Liu.sn@gmail.com> - 5.15.13-2
+- Add riscv64 to macro %qt5_qtwebengine_arches.
+
+* Mon Mar 11 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.13-1
+- 5.15.13
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Jan 02 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.12-1
+- 5.15.12
+
+* Sun Oct 08 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-1
+- 5.15.11
+
+* Fri Oct 06 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.10-3
+- 5.15.11
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jun 12 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.10-1
+- 5.15.10
+
+* Tue Apr 11 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
+- 5.15.9
+
+* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-3
+- migrated to SPDX license
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jan 05 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.8-1
+- 5.15.8
+
+* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
+- 5.15.7
+
+* Tue Sep 20 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.6-1
+- 5.15.6
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-1
+- 5.15.5
+
+* Mon May 16 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.4-1
+- 5.15.4
+
+* Fri Mar 04 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
+- 5.15.3
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+
+* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
+- 5.15.1
+
+* Wed Aug 19 2020 Troy Dawson <tdawson@redhat.com> - 5.14.2-5
+- fix rpm-macros for RHEL builds
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-3
+- drop qt5,qt5-devel metapackages f32+
+
+* Mon Apr 06 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-2
+- qt5-devel: drop R: qt5-qtenginio-devel
+
+* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
+- 5.14.2
+- drop qt5-qtwebkit from metapackage (hasn't been a core qt5 pkg for awhile)
+
+* 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