Resolves: RHEL-27845
Resolves: RHEL-31145
This commit is contained in:
Jan Grulich 2024-04-19 13:28:08 +02:00
parent b625d11e7c
commit 91417d4aef
3 changed files with 15 additions and 6 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@
/qt3d-everywhere-src-6.5.3.tar.xz /qt3d-everywhere-src-6.5.3.tar.xz
/qt3d-everywhere-src-6.6.0.tar.xz /qt3d-everywhere-src-6.6.0.tar.xz
/qt3d-everywhere-src-6.6.1.tar.xz /qt3d-everywhere-src-6.6.1.tar.xz
/qt3d-everywhere-src-6.7.0.tar.xz

View File

@ -8,8 +8,8 @@
Summary: Qt6 - Qt3D QML bindings and C++ APIs Summary: Qt6 - Qt3D QML bindings and C++ APIs
Name: qt6-%{qt_module} Name: qt6-%{qt_module}
Version: 6.6.1 Version: 6.7.0
Release: 5%{?dist} Release: 1%{?dist}
%global examples 1 %global examples 1
%global build_tests 1 %global build_tests 1
@ -38,9 +38,11 @@ BuildRequires: qt6-qtbase-private-devel
BuildRequires: qt6-qtdeclarative-devel BuildRequires: qt6-qtdeclarative-devel
BuildRequires: qt6-qtshadertools-devel BuildRequires: qt6-qtshadertools-devel
BuildRequires: qt6-qtimageformats BuildRequires: qt6-qtimageformats
# FIXME: enable with newer assimp %if 0%{?fedora} && 0%{?fedora} >= 40
%if 0%{?fedora} %global bundled_assimp 0
BuildRequires: pkgconfig(assimp) >= 3.3.1 BuildRequires: pkgconfig(assimp) >= 3.3.1
%else
%global bundled_assimp 1
%endif %endif
Requires: qt6-qtimageformats%{?_isa} >= %{version} Requires: qt6-qtimageformats%{?_isa} >= %{version}
@ -86,7 +88,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%cmake_qt6 \ %cmake_qt6 \
-DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \
-DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \ -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} \
-DQT_FEATURE_qt3d_system_assimp=%{?fedora:ON}%{!?fedora:OFF} -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} \
-DQT_FEATURE_qt3d_system_assimp=%{?bundled_assimp:OFF}%{!?bundled_assimp:ON}
%cmake_build %cmake_build
@ -221,6 +224,11 @@ popd
%endif %endif
%changelog %changelog
* Fri Apr 19 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
- 6.7.0
Resolves: RHEL-27845
Resolves: RHEL-31145
* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-5 * Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-5
- Add -tests subpackage with unit tests that can run in CI - Add -tests subpackage with unit tests that can run in CI
Resolves: RHEL-28239 Resolves: RHEL-28239

View File

@ -1 +1 @@
SHA512 (qt3d-everywhere-src-6.6.1.tar.xz) = c924ded219fb6a6f49eff83b41f9d290119f99e9910521098c6d979282ebfe1dab32afdd7a249fdedecad26a8683776087ef15b5657976e2ae85de7319c67c19 SHA512 (qt3d-everywhere-src-6.7.0.tar.xz) = 538027077f9729b91ecc3a4de4a14be212236d0bc4b1f4533a558753b6cb7aa23e1c169c921fa71d61d5f9cffbb85a0535000bf677ca09962ca62cbfcc60e70d