diff --git a/SOURCES/macros.qt6 b/SOURCES/macros.qt6 index 1ce51b8..cb5d876 100644 --- a/SOURCES/macros.qt6 +++ b/SOURCES/macros.qt6 @@ -7,6 +7,7 @@ %_qt6_archdatadir %{_libdir}/qt6 %_qt6_bindir %{_libdir}/qt6/bin %_qt6_datadir %{_datadir}/qt6 +%_qt6_descriptionsdir %{_qt6_archdatadir}/modules %_qt6_docdir %{_docdir}/qt6 %_qt6_examplesdir %{_qt6_archdatadir}/examples %_qt6_headerdir %{_includedir}/qt6 @@ -14,6 +15,7 @@ %_qt6_importdir %{_qt6_archdatadir}/imports %_qt6_libdir %{_libdir} %_qt6_libexecdir %{_qt6_archdatadir}/libexec +%_qt6_metatypesdir %{_qt6_archdatadir}/metatypes %_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs %_qt6_plugindir %{_qt6_archdatadir}/plugins %_qt6_qmldir %{_qt6_archdatadir}/qml diff --git a/SPECS/qt6.spec b/SPECS/qt6.spec index 1263156..278a7a3 100644 --- a/SPECS/qt6.spec +++ b/SPECS/qt6.spec @@ -1,8 +1,8 @@ Name: qt6 # This version MUST remain in sync with Qt6 versions! -Version: 6.7.1 -Release: 5%{?dist} +Version: 6.8.1 +Release: 3%{?dist} Summary: Qt6 meta package License: GPL-3.0-only URL: https://getfedora.org/ @@ -11,7 +11,6 @@ Source1: macros.qt6-srpm Source2: qmake-qt6.sh Source3: qt6qml.attr Source4: qt6qml.prov -BuildArch: noarch Requires: qt6-qt3d Requires: qt6-qt5compat @@ -23,12 +22,11 @@ Requires: qt6-qtcharts Requires: qt6-qtconnectivity Requires: qt6-qtdatavis3d Requires: qt6-qtdeclarative -Requires: qt6-qtdoc Requires: qt6-qtimageformats Requires: qt6-qtlocation -Requires: qt6-qtlottie Requires: qt6-qtmultimedia Requires: qt6-qtnetworkauth +Requires: qt6-qtpositioning Requires: qt6-qtquick3d Requires: qt6-qtquicktimeline Requires: qt6-qtremoteobjects @@ -52,8 +50,6 @@ Requires: qt6-qtwebsockets Summary: Qt6 meta devel package Requires: qt6-designer Requires: qt6-linguist -Requires: qt6-qdoc -Requires: qt6-qhelpgenerator Requires: qt6-qt3d-devel Requires: qt6-qt5compat-devel Requires: qt6-qtbase-devel @@ -63,11 +59,10 @@ Requires: qt6-qtconnectivity-devel Requires: qt6-qtdatavis3d-devel Requires: qt6-qtdeclarative-devel Requires: qt6-qtdeclarative-static -Requires: qt6-qtimageformats-devel Requires: qt6-qtlocation-devel -Requires: qt6-qtlottie-devel Requires: qt6-qtmultimedia-devel Requires: qt6-qtnetworkauth-devel +Requires: qt6-qtpositioning-devel Requires: qt6-qtquick3d-devel Requires: qt6-qtquicktimeline-devel Requires: qt6-qtremoteobjects-devel @@ -110,21 +105,36 @@ 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}%{_prefix}/lib/qt6 +mkdir -p %{buildroot}%{_prefix}/lib/qt6/bin +mkdir -p %{buildroot}%{_prefix}/lib/qt6/cmake +mkdir -p %{buildroot}%{_prefix}/lib/qt6/examples +mkdir -p %{buildroot}%{_prefix}/lib/qt6/imports +mkdir -p %{buildroot}%{_prefix}/lib/qt6/metatypes +mkdir -p %{buildroot}%{_prefix}/lib/qt6/modules +mkdir -p %{buildroot}%{_prefix}/lib/qt6/libexec +mkdir -p %{buildroot}%{_prefix}/lib/qt6/mkspecs +mkdir -p %{buildroot}%{_prefix}/lib/qt6/plugins +mkdir -p %{buildroot}%{_prefix}/lib/qt6/qml +%if "%{_lib}" != "lib" +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6 +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/bin +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/cmake +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/examples +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/imports +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/metatypes +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/modules +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/libexec +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/mkspecs +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/plugins +mkdir -p %{buildroot}%{_prefix}/%{_lib}/qt6/qml +%endif 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 @@ -172,33 +182,47 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %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 +%if "%{_lib}" != "lib" +%dir %{_prefix}/%{_lib}/qt6 +%dir %{_prefix}/%{_lib}/qt6/bin +%dir %{_prefix}/%{_lib}/qt6/cmake +%dir %{_prefix}/%{_lib}/qt6/examples +%dir %{_prefix}/%{_lib}/qt6/imports +%dir %{_prefix}/%{_lib}/qt6/metatypes +%dir %{_prefix}/%{_lib}/qt6/modules +%dir %{_prefix}/%{_lib}/qt6/libexec +%dir %{_prefix}/%{_lib}/qt6/mkspecs +%dir %{_prefix}/%{_lib}/qt6/plugins %dir %{_prefix}/%{_lib}/qt6/qml +%endif %dir %{_datadir}/qt6 %dir %{_docdir}/qt6 %dir %{_includedir}/qt6 %dir %{_datadir}/qt6/translations %changelog +* Tue Dec 10 2024 Jan Grulich - 6.8.1-3 +- Create lib64 directories only on 64bit architectures + Resolves: RHEL-53982 + +* Thu Dec 05 2024 Jan Grulich - 6.8.1-2 +- Add qt6_metatypesdir and qt6_descriptionsdir macros + Resolves: RHEL-53982 + +* Mon Dec 02 2024 Jan Grulich - 6.8.1-1 +- 6.8.1 + Resolves: RHEL-53982 + * Tue Oct 29 2024 Troy Dawson - 6.7.1-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018