Compare commits

..

1 commit

Author SHA1 Message Date
Yaakov Selkowitz
4bbc12cf84 Fix %qt6_qtwebengine_arches
Make this match the ExclusiveArch tag of qt6-qtwebengine.  QtWebEngine
cannot be built (natively) for 32-bit arches, and MIPS is obsolete.
2023-10-05 15:23:16 +02:00
5 changed files with 16 additions and 193 deletions

View file

@ -7,7 +7,6 @@
%_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
@ -15,7 +14,6 @@
%_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
@ -64,5 +62,4 @@
-DINSTALL_QMLDIR=%{_qt6_qmldir} \\\
-DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \\\
-DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\
-DQT_DISABLE_RPATH=TRUE \\\
-DCMAKE_MESSAGE_LOG_LEVEL=STATUS
-DQT_DISABLE_RPATH=TRUE

View file

@ -5,5 +5,5 @@
# # If you cannot get this package to build on your secondary architecure, please:
# # * remove your architecture from this list AND
# # * put #1298011 onto your ExcludeArch tracker.
%qt6_qtwebengine_arches x86_64 aarch64 ppc64le
%qt6_qtwebengine_arches x86_64 aarch64

194
qt6.spec
View file

@ -1,16 +1,14 @@
Name: qt6
# This version MUST remain in sync with Qt6 versions!
Version: 6.10.1
Release: 1%{?dist}
Version: 6.5.1
Release: 2%{?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
Source3: qt6qml.attr
Source4: qt6qml.prov
BuildArch: noarch
Requires: qt6-qt3d
Requires: qt6-qt5compat
@ -22,11 +20,12 @@ 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
@ -50,6 +49,8 @@ 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
@ -59,10 +60,11 @@ 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
@ -84,61 +86,22 @@ Requires: qt6-rpm-macros
%{summary}.
%package rpm-macros
Summary: RPM macros for building Qt6 and KDE Frameworks 6 packages
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
# 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 -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6
install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/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
@ -170,8 +133,6 @@ 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/
@ -180,137 +141,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
%{_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
* Thu Nov 20 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.1-1
- 6.10.1
* Tue Oct 07 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0-1
- 6.10.0
* Thu Sep 25 2025 Jan Grulich <jgrulich@redhat.com> - 6.10.0~rc-1
- 6.10.0 RC
* Thu Aug 28 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.2-1
- 6.9.2
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Jun 02 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.1-1
- 6.9.1
* Tue Apr 15 2025 Pavel Solovev <daron439@gmail.com> - 6.9.0-2
- Enable configuration summary
* Wed Apr 02 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.0-1
- 6.9.0
* Fri Mar 21 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.0~rc-1
- 6.9.0 RC
* Mon Feb 17 2025 Jan Grulich <jgrulich@redhat.com> - 6.8.2-2
- Add ppc64le support to qt6_qtwebengine_arches macro
* Fri Jan 31 2025 Jan Grulich <jgrulich@redhat.com> - 6.8.2-1
- 6.8.2
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Dec 10 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-4
- Create lib64 directories only on 64bit architectures
* Thu Dec 05 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-3
- Fix qt6_metatypesdir macro
* Thu Dec 05 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
- Add qt6_metatypesdir and qt6_descriptionsdir macros
* Mon Dec 02 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-1
- 6.8.1
* Wed Oct 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.0-1
- 6.8.0
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.7.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 15 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.2-2
- Introduce qt6-filesystem package
* Mon Jul 01 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.2-1
- 6.7.2
* Tue May 21 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
- 6.7.1
* Tue Apr 02 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
- 6.7.0
* Sun Jan 28 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
- 6.6.2
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jan 03 2024 Alessandro Astone <ales.astone@gmail.com> - 6.6.1-3
- Make qml dependency generator script executable
* Tue Dec 05 2023 Yaakov Selkowitz <yselkowitz@fedoraproject.org> - 6.6.1-2
- Auto-generate qt6qml() virtual provides
* Mon Nov 27 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.1-1
- 6.6.1
* Tue Oct 10 2023 Jan Grulich <jgrulich@redhat.com> - 6.6.0-1
- 6.6.0
* Sun Oct 01 2023 Justin Zobel <justin.zobel@gmail.com> - 6.5.3-1
- Update to 6.5.3
* Tue Sep 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 6.5.2-3
* Tue Sep 05 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 6.5.1-2
- Fix %%qt6_qtwebengine_arches
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jul 21 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.2-1
- 6.5.2
* Mon May 22 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
- 6.5.1

View file

@ -1,2 +0,0 @@
%__qt6qml_path ^%{_qt6_qmldir}(/[^/]+)+/qmldir$
%__qt6qml_provides %{_rpmconfigdir}/qt6qml.prov

View file

@ -1,6 +0,0 @@
#! /bin/sh
grep '/qt6/qml/.*/qmldir$' |
while read fn; do
sed -ne "s/^module \(.*\)/qt6qml(\1)/p" "${fn}"
done