macros.qt5

@@ -11,13 +11,7 @@
 %_qt5_libexecdir %{_qt5_archdatadir}/libexec
 %_qt5_plugindir %{_qt5_archdatadir}/plugins
 %_qt5_qmldir %{_qt5_archdatadir}/qml
-%_qt5_qmake \\\
-%ifarch noarch \
-%{_bindir}/qmake-qt5 \\\
-%else \
-%{_prefix}/%{_lib}/qt5/bin/qmake \\\
-%endif \
-%{nil}
+%_qt5_qmake @@QMAKE@@
 %_qt5_settingsdir %{_sysconfdir}/xdg
 %_qt5_sysconfdir %{_qt5_settingsdir}
 %_qt5_translationdir %{_datadir}/qt5/translations
@@ -39,6 +33,3 @@
 %qmake_qt5 %{_qt5_qmake} %{?_qt5_qmake_flags}
 
 %qmake_qt5_wrapper @@QMAKE_QT5_WRAPPER@@
-
-%qmake_qt5_build %make_build
-%qmake_qt5_install %make_install INSTALL_ROOT=%{?buildroot}

macros.qt5-srpm

@@ -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.
-%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el riscv64 loongarch32 loongarch64 sw_64
+%qt5_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 mips mipsel mips64el
 

qt5.spec

@@ -1,6 +1,6 @@
 Name:          qt5
 Version:       5.15.10
-Release:       6
+Release:       1
 Summary:       Qt5 meta package
 License:       GPLv3
 URL:           https://getfedora.org/
@@ -60,15 +60,10 @@ sed -i \
   -e "s|@@QT5_CXXFLAGS@@|%{?qt5_cxxflags}|g" \
   -e "s|@@QT5_RPM_LD_FLAGS@@|%{?qt5_rpm_ld_flags}|g" \
   -e "s|@@QT5_RPM_OPT_FLAGS@@|%{?qt5_rpm_opt_flags}|g" \
+  -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt5/bin/qmake|g" \
   -e "s|@@QMAKE_QT5_WRAPPER@@|%{_bindir}/qmake-qt5.sh|g" \
   %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
 
-%if "%toolchain" == "clang"
-sed -i \
-  -e '/QMAKE_LFLAGS_RELEASE/a \  -spec linux-clang \\\\\\' \
-  %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5
-%endif
-
 mkdir -p %{buildroot}%{_docdir}/qt5
 mkdir -p %{buildroot}%{_docdir}/qt5-devel
 echo "- Qt5 meta package" > %{buildroot}%{_docdir}/qt5/README
@@ -93,21 +88,6 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 %{_rpmconfigdir}/macros.d/macros.qt5-srpm
 
 %changelog
-* Wed Apr 23 2025 mahailiang <mahailiang@uniontech.com> - 5.15.10-6
-- add sw_64 in macros qt5_qtwebengine_arches
-
-* Thu Nov 28 2024 Funda Wang <fundawang@yeah.net> - 5.15.10-5
-- Redefine qmake binary depending on buildarch at runtime
-
-* Sun Apr 07 2024 liweigang <liweiganga@uniontech.com> - 5.15.10-4
-- add loongarch in macros qt5_qtwebengine_arches
-
-* Sun Apr 7 2024 shafeipaozi <sunbo.oerv@isrc.iscas.ac.cn> - 5.15.10-3
-- add riscv64 in macros qt5_qtwebengine_arches
-
-* Wed Sep 13 2023 yoo <sunyuechi@iscas.ac.cn> - 5.15.10-2
-- fix other qt5-xx pkg, clang build need -spec linux-clang
-
 * Mon Aug 07 2023 peijiankang <peijiankang@kylinos.cn> - 5.15.10-1
 - update to 5.15.10