Redefine qmake binary depending on buildarch at runtime

(cherry picked from commit eaadab9d771f48afc00ba61ba29cc891c954d9a4)

macros.qt6

@@ -17,7 +17,13 @@
 %_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs
 %_qt6_plugindir %{_qt6_archdatadir}/plugins
 %_qt6_qmldir %{_qt6_archdatadir}/qml
-%_qt6_qmake @@QMAKE@@
+%_qt6_qmake \\\
+%ifarch noarch \
+%{_bindir}/qmake6 \\\
+%else \
+%{_prefix}/%{_lib}/qt6/bin/qmake \\\
+%endif \
+%{nil}
 %_qt6_settingsdir %{_sysconfdir}/xdg
 %_qt6_sysconfdir %{_qt6_settingsdir}
 %_qt6_translationdir %{_datadir}/qt6/translations

qt6.spec

@@ -1,6 +1,6 @@
 Name:      qt6
 Version:   6.5.2
-Release:   1
+Release:   2
 Summary:   Qt6 meta package
 License:   GPL-3.0-only
 Source0:   macros.qt6
@@ -112,7 +112,6 @@ sed -i \
   -e "s|@@QT6_CXXFLAGS@@|%{?qt6_cxxflags}|g" \
   -e "s|@@QT6_RPM_LD_FLAGS@@|%{?qt6_rpm_ld_flags}|g" \
   -e "s|@@QT6_RPM_OPT_FLAGS@@|%{?qt6_rpm_opt_flags}|g" \
-  -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt6/bin/qmake|g" \
   -e "s|@@QMAKE_QT6_WRAPPER@@|%{_bindir}/qmake-qt6.sh|g" \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6
 
@@ -139,6 +138,9 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
 
 
 %changelog
+* Thu Nov 28 2024 Funda Wang <fundawang@yeah.net> - 6.5.2-2
+- Redefine qmake binary depending on buildarch at runtime
+
 * Wed Nov 29 2023 peijiankang <peijiankang@kylinos.cn> - 6.5.2-1
 - 6.5.2