From a44a6ccdaba3e7dc07747d50a030b24b6f68bf71 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Mon, 22 Jul 2024 11:47:25 +0200
Subject: [PATCH] Introduce qt6-filesystem package

Resolves: RHEL-50034
---
 qt6.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 57 insertions(+), 3 deletions(-)

diff --git a/qt6.spec b/qt6.spec
index d24bc09..33b0864 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -1,10 +1,11 @@
 
 Name: qt6
+# This version MUST remain in sync with Qt6 versions!
 Version: 6.7.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Qt6 meta package
 License: GPL-3.0-only
-URL: https://getfedora.org/
+URL:     https://getfedora.org/
 Source0: macros.qt6
 Source1: macros.qt6-srpm
 Source2: qmake-qt6.sh
@@ -88,20 +89,42 @@ Requires: qt6-rpm-macros
 %{summary}.
 
 %package rpm-macros
-Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages
+Summary: RPM macros for building Qt6 and KDE Frameworks 6 packages
 Requires: cmake >= 3
 Requires: gcc-c++
 Requires: chrpath
+BuildArch: noarch
 %description rpm-macros
 %{summary}.
 
 %package srpm-macros
 Summary: RPM macros for source Qt6 packages
+BuildArch: noarch
 %description srpm-macros
 %{summary}.
 
+%package filesystem
+Summary: Filesystem for Qt6 packages
+%description filesystem
+Filesystem for Qt 6 packages.
 
 %install
+# See macros.qt6 where the directories are specified
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/bin
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/cmake
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/examples
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/imports
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/metatypes
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/modules
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/libexec
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/mkspecs
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/plugins
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/qml
+mkdir -p %{buildroot}%{_datadir}/qt6
+mkdir -p %{buildroot}%{_docdir}/qt6
+mkdir -p %{buildroot}%{_includedir}/qt6
+mkdir -p %{buildroot}%{_datadir}/qt6/translations
 install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.qt6
 install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.qt6-srpm
 install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt6.sh
@@ -147,8 +170,39 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
 %files srpm-macros
 %{_rpmmacrodir}/macros.qt6-srpm
 
+%files filesystem
+%dir %{_prefix}/lib/qt6
+%dir %{_prefix}/%{_lib}/qt6
+%dir %{_prefix}/lib/qt6/bin
+%dir %{_prefix}/%{_lib}/qt6/bin
+%dir %{_prefix}/lib/qt6/cmake
+%dir %{_prefix}/%{_lib}/qt6/cmake
+%dir %{_prefix}/lib/qt6/examples
+%dir %{_prefix}/%{_lib}/qt6/examples
+%dir %{_prefix}/lib/qt6/imports
+%dir %{_prefix}/%{_lib}/qt6/imports
+%dir %{_prefix}/lib/qt6/metatypes
+%dir %{_prefix}/%{_lib}/qt6/metatypes
+%dir %{_prefix}/lib/qt6/modules
+%dir %{_prefix}/%{_lib}/qt6/modules
+%dir %{_prefix}/lib/qt6/libexec
+%dir %{_prefix}/%{_lib}/qt6/libexec
+%dir %{_prefix}/lib/qt6/mkspecs
+%dir %{_prefix}/%{_lib}/qt6/mkspecs
+%dir %{_prefix}/lib/qt6/plugins
+%dir %{_prefix}/%{_lib}/qt6/plugins
+%dir %{_prefix}/lib/qt6/qml
+%dir %{_prefix}/%{_lib}/qt6/qml
+%dir %{_datadir}/qt6
+%dir %{_docdir}/qt6
+%dir %{_includedir}/qt6
+%dir %{_datadir}/qt6/translations
 
 %changelog
+* Mon Jul 22 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-4
+- Introduce qt6-filesystem package
+  Resolves: RHEL-50034
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3
 - Bump release for June 2024 mass rebuild