diff --git a/macros.qt6 b/macros.qt6 index 53f03c2dcd9ec529e9c080bc7cca16190acaf0a2..f648bc2bc0ab5eaa38d2e5c7651a96e8c22422ff 100644 --- a/macros.qt6 +++ b/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/qt6.spec b/qt6.spec index 667e3328908f61991958f7a25d90abf3e8b39717..2637137753fbee18e2af77626a96b5d218be1c08 100644 --- a/qt6.spec +++ b/qt6.spec @@ -1,12 +1,13 @@ Name: qt6 -Version: 6.5.2 -Release: 2 +Version: 6.8.2 +Release: 1 Summary: Qt6 meta package License: GPL-3.0-only Source0: macros.qt6 Source1: macros.qt6-srpm Source2: qmake-qt6.sh -BuildArch: noarch +Source3: qt6qml.attr +Source4: qt6qml.prov Requires: qt6-qt3d Requires: qt6-qt5compat @@ -18,12 +19,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 @@ -46,8 +46,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 @@ -57,11 +55,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 @@ -86,19 +83,57 @@ Requires: qt6-rpm-macros Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages Requires: cmake >= 3 Requires: gcc-c++ +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 -install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6 -install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6-srpm +# See macros.qt6 where the directories are specified +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 +install -Dpm644 %{SOURCE3} %{buildroot}%{_fileattrsdir}/qt6qml.attr +install -Dpm755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/qt6qml.prov mkdir -p %{buildroot}%{_datadir}/qt6/wrappers ln -s %{_bindir}/qmake-qt6.sh %{buildroot}%{_datadir}/qt6/wrappers/qmake-qt6 ln -s %{_bindir}/qmake-qt6.sh %{buildroot}%{_datadir}/qt6/wrappers/qmake @@ -129,6 +164,8 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %endif %files rpm-macros +%{_fileattrsdir}/qt6qml.attr +%{_rpmconfigdir}/qt6qml.prov %{_rpmmacrodir}/macros.qt6 %{_bindir}/qmake-qt6.sh %{_datadir}/qt6/wrappers/ @@ -136,8 +173,43 @@ 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/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 +%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 +* Fri Jan 31 2025 Funda Wang - 6.8.2-1 +- update to 6.8.2 +- auto-generate qt6qml() virtual provides +- add qt6_metatypesdir and qt6_descriptionsdir macros +- introduce qt6-filesystem package + * Thu Nov 28 2024 Funda Wang - 6.5.2-2 - Redefine qmake binary depending on buildarch at runtime diff --git a/qt6qml.attr b/qt6qml.attr new file mode 100644 index 0000000000000000000000000000000000000000..567c298624ed89c7df1c231d0ea7830371dfc04f --- /dev/null +++ b/qt6qml.attr @@ -0,0 +1,2 @@ +%__qt6qml_path ^%{_qt6_qmldir}(/[^/]+)+/qmldir$ +%__qt6qml_provides %{_rpmconfigdir}/qt6qml.prov diff --git a/qt6qml.prov b/qt6qml.prov new file mode 100644 index 0000000000000000000000000000000000000000..cce4b507f2ac1345d8e0f7718ee9c6defbfd5235 --- /dev/null +++ b/qt6qml.prov @@ -0,0 +1,6 @@ +#! /bin/sh + +grep '/qt6/qml/.*/qmldir$' | +while read fn; do + sed -ne "s/^module \(.*\)/qt6qml(\1)/p" "${fn}" +done