From c65e0b77e227998d192fe527d8c72cd12a0fce9f1ab05600db24a0d5a98c655e Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 22 Nov 2020 21:09:27 +0000
Subject: [PATCH] Accepting request 849847 from home:Vogtinator:qt5.15

Qt 5.15.2. qt3d on Leap now without assimp

OBS-URL: https://build.opensuse.org/request/show/849847
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=12
---
 libqt5-qt3d.changes               | 12 +++++++++++
 libqt5-qt3d.spec                  | 34 +++++++++++++++++++++++--------
 qt3d-everywhere-src-5.15.1.tar.xz |  3 ---
 qt3d-everywhere-src-5.15.2.tar.xz |  3 +++
 4 files changed, 40 insertions(+), 12 deletions(-)
 delete mode 100644 qt3d-everywhere-src-5.15.1.tar.xz
 create mode 100644 qt3d-everywhere-src-5.15.2.tar.xz

diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes
index 6b4eccc..bdde139 100644
--- a/libqt5-qt3d.changes
+++ b/libqt5-qt3d.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.15.2:
+  * New bugfix release
+  * For more details please see:
+    http://code.qt.io/cgit/qt/qt3d.git/plain/dist/changes-5.15.2/?h=5.15.2
+- Use only the system provided assimp, which is only available on TW for now
+- Link from Qt bindir into %_bindir, not the other way around to fix
+  applicationDirPath called from Qt binaries
+- Add -qt5 suffix to all binaries in %_bindir
+
 -------------------------------------------------------------------
 Thu Sep 10 07:56:59 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec
index 68f442b..0a3f18f 100644
--- a/libqt5-qt3d.spec
+++ b/libqt5-qt3d.spec
@@ -19,11 +19,12 @@
 %define qt5_snapshot 0
 %define libname libQt53DCore5
 %define base_name libqt5
-%define real_version 5.15.1
-%define so_version 5.15.1
-%define tar_version qt3d-everywhere-src-5.15.1
+%define real_version 5.15.2
+%define so_version 5.15.2
+%define tar_version qt3d-everywhere-src-5.15.2
+%global enable_assimp (0%{?suse_version} >= 1550)
 Name:           libqt5-qt3d
-Version:        5.15.1
+Version:        5.15.2
 Release:        0
 Summary:        Qt 5 3D Addon
 # Legal: some files are GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -46,6 +47,9 @@ BuildRequires:  perl
 %endif
 BuildRequires:  pkgconfig
 BuildRequires:  xz
+%if %{enable_assimp}
+BuildRequires:  pkgconfig(assimp) > 3.3.1
+%endif
 BuildRequires:  pkgconfig(zlib)
 
 %description
@@ -395,7 +399,13 @@ the exact Qt version.
 #force the configure script to generate the forwarding headers (it checks whether .git directory exists)
 mkdir .git
 %endif
-%qmake5
+%qmake5 -- \
+%if %{enable_assimp}
+	-system-assimp \
+%else
+	-no-assimp \
+%endif
+
 %make_jobs
 
 %install
@@ -404,15 +414,18 @@ mkdir .git
 # kill .la files
 rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
 
-%fdupes %{buildroot}
+%if %{enable_assimp}
 # put all the binaries to %%_bindir and symlink them back to %%_qt5_bindir
 mkdir -p %{buildroot}%{_bindir}
 pushd %{buildroot}%{_libqt5_bindir}
 for i in * ; do
-      mv $i ../../../bin/
-      ln -s ../../../bin/$i .
+      ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
+      ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
 done
 popd
+%endif
+
+%fdupes %{buildroot}
 
 %files -n %{libname}
 %defattr(-,root,root,755)
@@ -441,7 +454,7 @@ popd
 %dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so
-%if 0%{?suse_version} >= 1500
+%if %{enable_assimp}
 %{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so
 %endif
 %dir %{_libqt5_libdir}/qt5/plugins/geometryloaders
@@ -490,8 +503,11 @@ popd
 %files tools
 %defattr(-,root,root,755)
 %license LICENSE.*
+%if %{enable_assimp}
 %{_bindir}/qgltf
+%{_bindir}/qgltf-qt5
 %{_libqt5_bindir}/qgltf
+%endif
 
 %files examples
 %defattr(-,root,root,755)
diff --git a/qt3d-everywhere-src-5.15.1.tar.xz b/qt3d-everywhere-src-5.15.1.tar.xz
deleted file mode 100644
index 339abe2..0000000
--- a/qt3d-everywhere-src-5.15.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411
-size 81919836
diff --git a/qt3d-everywhere-src-5.15.2.tar.xz b/qt3d-everywhere-src-5.15.2.tar.xz
new file mode 100644
index 0000000..ec0eaef
--- /dev/null
+++ b/qt3d-everywhere-src-5.15.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d
+size 81925416