diff --git a/qt.spec b/qt.spec index 1d10fa2f0e4bc49846370a84d7f0c617e4afd47b..efef63433c6a568d07b31cfcd3442825de0cafac 100644 --- a/qt.spec +++ b/qt.spec @@ -1,7 +1,7 @@ %if "%{?__isa_bits}" == "64" %define platform linux-g++-64 %endif -%ifarch x86_64 aarch64 +%ifarch x86_64 aarch64 sw_64 %define platform linux-g++ %endif %define _qt4_prefix %{_libdir}/qt4 @@ -13,7 +13,7 @@ Name: qt Epoch: 1 Version: 4.8.7 -Release: 53 +Release: 54 Summary: A software toolkit for developing applications License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT URL: http://qt-project.org/ @@ -163,7 +163,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` CXXFLAGS="$CXXFLAGS -std=gnu++98 -Wno-deprecated" export LD_LIBRARY_PATH=$PWD/lib/ -%ifarch loongarch64 +%ifarch loongarch64 sw_64 export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -fpermissive" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fpermissive" %else @@ -418,10 +418,19 @@ fi %dir %{_qt4_prefix}/plugins %dir %{_qt4_prefix}/plugins/crypto/ %dir %{_qt4_prefix}/plugins/sqldrivers/ +%ifarch loongarch64 sw_64 +%{_bindir}/{assistant*,qt*config*,qdbusviewer,qvfb,qdbus} +%{_datadir}/applications/*qdbusviewer.desktop +%{_qt4_prefix}/bin/{assistant*,qt*config*,qvfb,qdbusviewer,qdbus} +%exclude %{_bindir}/qt*demo* +%exclude %{_datadir}/applications/*qtdemo.desktop +%exclude %{_qt4_prefix}/bin/qt*demo* +%else %{_bindir}/{assistant*,qt*config*,qt*demo*,qdbusviewer,qvfb,qdbus} +%{_datadir}/applications/{*qtdemo,*qdbusviewer}.desktop %{_qt4_prefix}/bin/{assistant*,qt*config*,qt*demo*,qvfb,qdbusviewer,qdbus} +%endif %{_datadir}/applications/{*assistant,*qtconfig}.desktop -%{_datadir}/applications/{*qtdemo,*qdbusviewer}.desktop %{_datadir}/icons/hicolor/*/apps/assistant* %exclude %{_docdir}/qt4/qch/{designer.qch,linguist.qch} %dir %{_qt4_prefix}/imports/ @@ -455,6 +464,9 @@ fi %{_qt4_prefix}/examples/ %changelog +* Mon Sep 11 2023 panchenbo - 1:4.8.7-54 +- fix sw_64 build error and exclude loongarch64 sw_64 qtdemo + * Mon Aug 21 2023 peijiankang - 1:4.8.7-53 - Type:cves - ID:CVE-2023-32573