From 91417d4aef96d793912ef869256906a67de6d240 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 19 Apr 2024 13:28:08 +0200
Subject: [PATCH] 6.7.0

Resolves: RHEL-27845
Resolves: RHEL-31145
---
 .gitignore    |  1 +
 qt6-qt3d.spec | 18 +++++++++++++-----
 sources       |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fc9616..760ff4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /qt3d-everywhere-src-6.5.3.tar.xz
 /qt3d-everywhere-src-6.6.0.tar.xz
 /qt3d-everywhere-src-6.6.1.tar.xz
+/qt3d-everywhere-src-6.7.0.tar.xz
diff --git a/qt6-qt3d.spec b/qt6-qt3d.spec
index a26e57e..c617e77 100644
--- a/qt6-qt3d.spec
+++ b/qt6-qt3d.spec
@@ -8,8 +8,8 @@
 
 Summary: Qt6 - Qt3D QML bindings and C++ APIs
 Name:    qt6-%{qt_module}
-Version: 6.6.1
-Release: 5%{?dist}
+Version: 6.7.0
+Release: 1%{?dist}
 
 %global examples 1
 %global build_tests 1
@@ -38,9 +38,11 @@ BuildRequires: qt6-qtbase-private-devel
 BuildRequires: qt6-qtdeclarative-devel
 BuildRequires: qt6-qtshadertools-devel
 BuildRequires: qt6-qtimageformats
-# FIXME: enable with newer assimp
-%if 0%{?fedora}
+%if 0%{?fedora} && 0%{?fedora} >= 40
+%global bundled_assimp 0
 BuildRequires: pkgconfig(assimp) >= 3.3.1
+%else
+%global bundled_assimp 1
 %endif
 Requires: qt6-qtimageformats%{?_isa} >= %{version}
 
@@ -86,7 +88,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %cmake_qt6 \
   -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples: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
 
@@ -221,6 +224,11 @@ popd
 %endif
 
 %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
 - Add -tests subpackage with unit tests that can run in CI
   Resolves: RHEL-28239
diff --git a/sources b/sources
index e359d40..2e7f481 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt3d-everywhere-src-6.6.1.tar.xz) = c924ded219fb6a6f49eff83b41f9d290119f99e9910521098c6d979282ebfe1dab32afdd7a249fdedecad26a8683776087ef15b5657976e2ae85de7319c67c19
+SHA512 (qt3d-everywhere-src-6.7.0.tar.xz) = 538027077f9729b91ecc3a4de4a14be212236d0bc4b1f4533a558753b6cb7aa23e1c169c921fa71d61d5f9cffbb85a0535000bf677ca09962ca62cbfcc60e70d