Create lib64 directories only on 64bit architectures

Resolves: RHEL-53982
This commit is contained in:
Jan Grulich 2024-12-10 17:25:29 +01:00
parent 151abcb748
commit 4fb1b666d3

View File

@ -2,7 +2,7 @@
Name: qt6
# This version MUST remain in sync with Qt6 versions!
Version: 6.8.1
Release: 2%{?dist}
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
@ -106,17 +105,30 @@ 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
@ -170,33 +182,39 @@ 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 <jgrulich@redhat.com> - 6.8.1-3
- Create lib64 directories only on 64bit architectures
Resolves: RHEL-53982
* Thu Dec 05 2024 Jan Grulich <jgrulich@redhat.com> - 6.8.1-2
- Add qt6_metatypesdir and qt6_descriptionsdir macros
Resolves: RHEL-53982