diff --git a/qt3d-everywhere-src-5.15.2.tar.xz b/qt3d-everywhere-opensource-src-5.15.10.tar.xz similarity index 69% rename from qt3d-everywhere-src-5.15.2.tar.xz rename to qt3d-everywhere-opensource-src-5.15.10.tar.xz index 9897395aaafb993d286415565039a52b145c8734..73a828b9983f3b8ab55186d4f79649eb629bb51b 100644 Binary files a/qt3d-everywhere-src-5.15.2.tar.xz and b/qt3d-everywhere-opensource-src-5.15.10.tar.xz differ diff --git a/qt5-qt3d.spec b/qt5-qt3d.spec index 5332cad3adb04bc1104b897522d59524e775eaac..8be9250a37c2265fa02c0cb63a0e4258bf656f49 100644 --- a/qt5-qt3d.spec +++ b/qt5-qt3d.spec @@ -1,36 +1,49 @@ -Name: qt5-qt3d -Version: 5.15.2 -Release: 1 -Summary: Qt5 - Qt3D C++ APIs and QML bindings -License: LGPLv2 with exceptions or GPLv3 with exceptions +%global qt_module qt3d + +%global multilib_archs x86_64 %{ix86} loongarch64 sw_64 + +Summary: Qt5 - Qt3D QML bindings and C++ APIs +Name: qt5-%{qt_module} +Version: 5.15.10 +Release: 1 +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qt3d-everywhere-src-%{version}.tar.xz +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz Source1: qt3dcore-config-multilib_p.h BuildRequires: make -BuildRequires: qt5-rpm-macros >= %{version} qt5-qtbase-private-devel qt5-qtdeclarative-devel -BuildRequires: qt5-qtimageformats qt5-qtxmlpatterns-devel pkgconfig(assimp) >= 3.3.1 -Requires: qt5-qtimageformats >= %{version} -%{?_qt5:Requires: %{_qt5} = %{_qt5_version}} +BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-static >= %{version} +BuildRequires: qt5-qtbase-private-devel +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtimageformats +BuildRequires: qt5-qtxmlpatterns-devel +BuildRequires: pkgconfig(assimp) >= 3.3.1 +Requires: qt5-qtimageformats%{?_isa} >= %{version} %description -Qt 3D support for 2D and 3D rendering in both Qt C++ and Qt Quick applications for -near-realtime simulation systems. +Qt 3D provides functionality for near-realtime simulation systems with +support for 2D and 3D rendering in both Qt C++ and Qt Quick applications). -%package devel -Summary: Provides development files for qt5-qt3d -Requires: qt5-qt3d = %{version}-%{release} qt5-qtbase-devel +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +%description devel +%{summary}. -Provides: %{name}-examples = %{version}-%{release} -Obsoletes: %{name}-examples < %{version}-%{release} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. -%description devel -Provides development files and programming examples for qt5-qt3d. %prep -%autosetup -n qt3d-everywhere-src-%{version} +%setup -q -n %{qt_module}-everywhere-src-%{version} + %build %define _lto_cflags %{nil} @@ -41,7 +54,8 @@ Provides development files and programming examples for qt5-qt3d. %install make install INSTALL_ROOT=%{buildroot} -%ifarch x86_64 +%ifarch %{multilib_archs} +# multilib: qt3dcore-config_p.h mv %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config-%{__isa_bits}_p.h install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt5_headerdir}/Qt3DCore/%{version}/Qt3DCore/private/qt3dcore-config_p.h %endif @@ -56,10 +70,8 @@ for prl_file in libQt5*.prl ; do done popd -%post -/sbin/ldconfig -%postun -/sbin/ldconfig + +%ldconfig_scriptlets %files %license LICENSE.GPL* LICENSE.LGPL* @@ -80,11 +92,15 @@ popd %{_qt5_includedir}/{Qt3DRender/,Qt3DQuickRender/,Qt3DCore/,Qt3DInput/} %{_qt5_libdir}/pkgconfig/*.pc %{_qt5_archdatadir}/mkspecs/modules/*.pri -%if 0%{?_qt5_examplesdir:1} + +%files examples %{_qt5_examplesdir}/ -%endif + %changelog +* Mon Aug 21 2023 huayadong - 5.15.10-1 +- update to version 5.15.10-1 + * Wed Oct 13 2021 peijiankang - 5.15.2-1 - update to upstream version 5.15.2 @@ -93,4 +109,3 @@ popd * Tue Dec 3 2019 Tianfei - 5.11.1-3 - Package init -