From a8fe117b2dbe5d18aaaf8e5627a78767d2d6cace Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 1 May 2024 02:31:57 +0300 Subject: [PATCH] import qt6-6.6.2-1.el9 --- SOURCES/qt6qml.attr | 2 ++ SOURCES/qt6qml.prov | 6 ++++++ SPECS/qt6.spec | 40 +++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 SOURCES/qt6qml.attr create mode 100755 SOURCES/qt6qml.prov diff --git a/SOURCES/qt6qml.attr b/SOURCES/qt6qml.attr new file mode 100644 index 0000000..567c298 --- /dev/null +++ b/SOURCES/qt6qml.attr @@ -0,0 +1,2 @@ +%__qt6qml_path ^%{_qt6_qmldir}(/[^/]+)+/qmldir$ +%__qt6qml_provides %{_rpmconfigdir}/qt6qml.prov diff --git a/SOURCES/qt6qml.prov b/SOURCES/qt6qml.prov new file mode 100755 index 0000000..cce4b50 --- /dev/null +++ b/SOURCES/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 diff --git a/SPECS/qt6.spec b/SPECS/qt6.spec index e7dd754..c245ee5 100644 --- a/SPECS/qt6.spec +++ b/SPECS/qt6.spec @@ -1,13 +1,15 @@ Name: qt6 -Version: 6.5.2 -Release: 3%{?dist} +Version: 6.6.2 +Release: 1%{?dist} Summary: Qt6 meta package License: GPL-3.0-only URL: https://getfedora.org/ Source0: macros.qt6 Source1: macros.qt6-srpm Source2: qmake-qt6.sh +Source3: qt6qml.attr +Source4: qt6qml.prov BuildArch: noarch Requires: qt6-qt3d @@ -99,9 +101,11 @@ Summary: RPM macros for source Qt6 packages %install -install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6 -install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6-srpm +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 @@ -133,6 +137,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/ @@ -142,9 +148,33 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %changelog -* Wed Jan 10 2024 MSVSphere Packaging Team - 6.5.2-3 +* Sun Jan 28 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 10 2024 MSVSphere Packaging Team - 6.6.1-3 - Rebuilt for MSVSphere 9.3 +* Wed Jan 03 2024 Alessandro Astone - 6.6.1-3 +- Make qml dependency generator script executable + +* Tue Dec 05 2023 Yaakov Selkowitz - 6.6.1-2 +- Auto-generate qt6qml() virtual provides + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- Update to 6.5.3 + * Tue Sep 05 2023 Yaakov Selkowitz - 6.5.2-3 - Fix %%qt6_qtwebengine_arches