Hello community, here is the log from the commit of package libqt5-qt3d for openSUSE:Factory checked in at 2020-11-26 23:13:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qt3d (Old) and /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qt3d" Thu Nov 26 23:13:00 2020 rev:29 rq:850010 version:5.15.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qt3d/libqt5-qt3d.changes 2020-09-15 16:22:06.034241235 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.5913/libqt5-qt3d.changes 2020-11-26 23:13:46.696978021 +0100 @@ -1,0 +2,12 @@ +Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt <fab...@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 + +------------------------------------------------------------------- Old: ---- qt3d-everywhere-src-5.15.1.tar.xz New: ---- qt3d-everywhere-src-5.15.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qt3d.spec ++++++ --- /var/tmp/diff_new_pack.GThrqP/_old 2020-11-26 23:13:52.536979855 +0100 +++ /var/tmp/diff_new_pack.GThrqP/_new 2020-11-26 23:13:52.540979856 +0100 @@ -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 @@ %endif BuildRequires: pkgconfig BuildRequires: xz +%if %{enable_assimp} +BuildRequires: pkgconfig(assimp) > 3.3.1 +%endif BuildRequires: pkgconfig(zlib) %description @@ -395,7 +399,13 @@ #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 @@ # 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 @@ %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 @@ %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) ++++++ qt3d-everywhere-src-5.15.1.tar.xz -> qt3d-everywhere-src-5.15.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qt3d/qt3d-everywhere-src-5.15.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qt3d.new.5913/qt3d-everywhere-src-5.15.2.tar.xz differ: char 25, line 1 _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
