From 8c0a57e4522658b0adffcd9553b1f929671b9468 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Mon, 22 Jul 2024 12:25:13 +0200
Subject: [PATCH] Use qt6-filesystem

Resolves: RHEL-50035
---
 qt6-qtbase.spec | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec
index 725402c..91b2a70 100644
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@@ -47,7 +47,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
 Version: 6.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://qt-project.org/
@@ -207,6 +207,8 @@ BuildRequires: time
 BuildRequires: (wlheadless-run and %{wlheadless_compositor})
 %endif
 
+Requires:      qt6-filesystem
+
 Requires: %{name}-common = %{version}-%{release}
 
 ## Sql drivers
@@ -472,7 +474,7 @@ sed -i \
   %{buildroot}%{_rpmmacrodir}/macros.qt6-qtbase
 
 # create/own dirs
-mkdir -p %{buildroot}{%{_qt6_archdatadir}/mkspecs/modules,%{_qt6_importdir},%{_qt6_libexecdir},%{_qt6_plugindir}/{designer,iconengines,script,styles},%{_qt6_translationdir}}
+mkdir -p %{buildroot}%{_qt6_plugindir}/{designer,iconengines,script,styles}
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject
 
 # hardlink files to {_bindir}, add -qt6 postfix to not conflict
@@ -552,19 +554,9 @@ make check -k ||:
 %{_qt6_libdir}/libQt6Sql.so.6*
 %{_qt6_libdir}/libQt6Test.so.6*
 %{_qt6_libdir}/libQt6Xml.so.6*
-%dir %{_qt6_docdir}/
 %{_qt6_docdir}/global/
 %{_qt6_docdir}/config/
-%{_qt6_importdir}/
-%{_qt6_translationdir}/
-%if "%{_qt6_prefix}" != "%{_prefix}"
-%dir %{_qt6_prefix}/
-%endif
-%dir %{_qt6_archdatadir}/
-%dir %{_qt6_datadir}/
 %{_qt6_datadir}/qtlogging.ini
-%dir %{_qt6_libexecdir}/
-%dir %{_qt6_plugindir}/
 %dir %{_qt6_plugindir}/designer/
 %dir %{_qt6_plugindir}/generic/
 %dir %{_qt6_plugindir}/iconengines/
@@ -589,8 +581,6 @@ make check -k ||:
 %{_rpmmacrodir}/macros.qt6-qtbase
 
 %files devel
-%dir %{_qt6_libdir}/qt6/modules
-%dir %{_qt6_libdir}/qt6/metatypes
 %dir %{_qt6_libdir}/cmake/Qt6
 %dir %{_qt6_libdir}/cmake/Qt6/platforms
 %dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform
@@ -623,9 +613,6 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6Widgets
 %dir %{_qt6_libdir}/cmake/Qt6WidgetsTools
 %dir %{_qt6_libdir}/cmake/Qt6Xml
-%if "%{_qt6_bindir}" != "%{_bindir}"
-%dir %{_qt6_bindir}
-%endif
 %{_bindir}/androiddeployqt
 %{_bindir}/androiddeployqt6
 %{_bindir}/androidtestrunner
@@ -661,9 +648,6 @@ make check -k ||:
 %{_qt6_libexecdir}/uic
 %{_qt6_libexecdir}/qt-testrunner.py
 %{_qt6_libdir}/qt6/modules/*.json
-%if "%{_qt6_headerdir}" != "%{_includedir}"
-%dir %{_qt6_headerdir}
-%endif
 %{_qt6_headerdir}/QtConcurrent/
 %{_qt6_headerdir}/QtCore/
 %{_qt6_headerdir}/QtDBus/
@@ -706,7 +690,7 @@ make check -k ||:
 %{_qt6_libdir}/libQt6Widgets.prl
 %{_qt6_libdir}/libQt6Widgets.so
 %{_qt6_libdir}/libQt6XcbQpa.prl
-%{_qt6_libdir}/libQt6XcbQpa.so 
+%{_qt6_libdir}/libQt6XcbQpa.so
 %{_qt6_libdir}/libQt6Xml.prl
 %{_qt6_libdir}/libQt6Xml.so
 %{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl
@@ -734,12 +718,12 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/*.cmake
 %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin/qt_attribution.json
 %{_qt6_libdir}/cmake/Qt6BuildInternals/*.cmake
-%{_qt6_libdir}/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp
 %{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
 %{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/Main.cmake
 %{_qt6_libdir}/cmake/Qt6Concurrent/*.cmake
 %{_qt6_libdir}/cmake/Qt6Core/*.cmake
+%{_qt6_libdir}/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp
 %{_qt6_libdir}/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in
 %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6DBus/*.cmake
@@ -800,11 +784,6 @@ make check -k ||:
 %{_qt6_examplesdir}/
 %endif
 
-%if 0%{?build_tests}
-%files tests
-%{_qt6_archdatadir}/tests
-%endif
-
 %if 0%{?ibase}
 %files ibase
 %{_qt6_plugindir}/sqldrivers/libqsqlibase.so
@@ -879,8 +858,16 @@ make check -k ||:
 %{_qt6_plugindir}/platformthemes/libqgtk3.so
 %{_qt6_plugindir}/printsupport/libcupsprintersupport.so
 
+%if 0%{?build_tests}
+%files tests
+%{_qt6_archdatadir}/tests
+%endif
 
 %changelog
+* Mon Jul 22 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-5
+- Use qt6-filesystem
+  Resolves: RHEL-50035
+
 * Mon Jul 08 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-4
 - HTTP2: Delay any communication until encrypted() can be responded to
   Resolves: RHEL-46346