Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libqt5-qt3d for openSUSE:Factory
checked in at 2024-07-24 15:31:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qt3d (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.1869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qt3d"
Wed Jul 24 15:31:32 2024 rev:45 rq:1189211 version:5.15.14+kde0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qt3d/libqt5-qt3d.changes 2024-05-30
15:33:52.387345062 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.1869/libqt5-qt3d.changes
2024-07-25 11:56:11.379083752 +0200
@@ -1,0 +2,5 @@
+Mon Jul 22 12:07:08 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Use system assimp unconditionally (boo#1228204)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qt3d.spec ++++++
--- /var/tmp/diff_new_pack.o5qaQ3/_old 2024-07-25 11:56:13.079156795 +0200
+++ /var/tmp/diff_new_pack.o5qaQ3/_new 2024-07-25 11:56:13.079156795 +0200
@@ -24,7 +24,6 @@
%define real_version 5.15.14
%define so_version 5.15.14
%define tar_version qt3d-everywhere-src-%{version}
-%global enable_assimp (0%{?suse_version} >= 1550)
Name: libqt5-qt3d
Version: 5.15.14+kde0
Release: 0
@@ -48,9 +47,7 @@
%endif
BuildRequires: pkgconfig
BuildRequires: xz
-%if %{enable_assimp}
BuildRequires: pkgconfig(assimp) > 3.3.1
-%endif
BuildRequires: pkgconfig(zlib)
%description
@@ -62,6 +59,8 @@
%prep
%autosetup -p1 -n %{tar_version}
+rm -r src/3rdparty/assimp/{src,unzip}
+
%package -n %{libname}
Summary: Qt 5 3D Addon
Group: System/Libraries
@@ -401,11 +400,7 @@
mkdir .git
%endif
%qmake5 -- \
-%if %{enable_assimp}
- -system-assimp \
-%else
- -no-assimp \
-%endif
+ -system-assimp
%make_jobs
@@ -415,7 +410,6 @@
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
-%if %{enable_assimp}
# put all the binaries to %%_bindir and symlink them back to %%_qt5_bindir
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_libqt5_bindir}
@@ -424,7 +418,6 @@
ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
done
popd
-%endif
%fdupes %{buildroot}
@@ -455,9 +448,7 @@
%dir %{_libqt5_libdir}/qt5/plugins/sceneparsers
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneimport.so
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libgltfsceneexport.so
-%if %{enable_assimp}
%{_libqt5_libdir}/qt5/plugins/sceneparsers/libassimpsceneimport.so
-%endif
%dir %{_libqt5_libdir}/qt5/plugins/geometryloaders
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libdefaultgeometryloader.so
%{_libqt5_libdir}/qt5/plugins/geometryloaders/libgltfgeometryloader.so
@@ -504,11 +495,9 @@
%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)
