From 3d1ef76f8c611219da35c2e5d6bc63f111603216 Mon Sep 17 00:00:00 2001 From: huayadong Date: Wed, 4 Sep 2024 16:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5master=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt5-qttools.spec | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 3733dc9..1b1d21a 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,8 +1,11 @@ +# Disable automatic .la file removal +%global __brp_remove_la_files %nil + %global qt_module qttools Name: qt5-qttools Version: 5.15.10 -Release: 4 +Release: 5 Summary: Qt5 QtTool module License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -133,13 +136,13 @@ Requires: %{name}-common = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} -%patch0 -p1 -b ..runqttools-with-qt5-suffix.patch +%patch -P0 -p1 -b ..runqttools-with-qt5-suffix.patch %ifarch %{mips32} -%patch1 -p1 -b .libatomic +%patch -P1 -p1 -b .libatomic %endif -%patch2 -p1 -b .libclang-cpp -%patch3 -p1 -%patch4 -p1 +%patch -P2 -p1 -b .libclang-cpp +%patch -P3 -p1 +%patch -P4 -p1 %build %{qmake_qt5} \ @@ -215,11 +218,6 @@ for RES in $(ls hicolor); do done cd - -%post -/sbin/ldconfig -%postun -/sbin/ldconfig - %files %{_bindir}/qdbus-qt5 %{_bindir}/qtpaths @@ -230,23 +228,16 @@ cd - %files common %license LICENSE.LGPL* -%ldconfig_scriptlets libs-designer - %files libs-designer %{_qt5_libdir}/libQt5Designer.so.5* %dir %{_qt5_libdir}/cmake/Qt5Designer/ -%ldconfig_scriptlets libs-designercomponents - %files libs-designercomponents %{_qt5_libdir}/libQt5DesignerComponents.so.5* -%ldconfig_scriptlets libs-help - %files libs-help %{_qt5_libdir}/libQt5Help.so.5* - %files -n qt5-assistant %{_bindir}/assistant-qt5 %{_qt5_bindir}/assistant* @@ -360,9 +351,13 @@ cd - %changelog -* Wed Sep 04 2024 huayadong - 5.15.10-4 +* Wed Sep 04 2024 huayadong - 5.15.10-5 - add Requires: clang-libs for qt5-doctools +* Thu Aug 29 2024 Funda Wang - 5.15.10-4 +- Disable automatic .la file removal +- cleanup spec + * Wed Jan 03 2024 wangqia - 5.15.10-3 - rebuild for clang update -- Gitee