diff --git a/0001-Fix-build-with-zlib.patch b/0001-Fix-build-with-zlib.patch deleted file mode 100644 index dcfccaf33768156237978b700d579e0fe0e5d068..0000000000000000000000000000000000000000 --- a/0001-Fix-build-with-zlib.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9ed6834c72971998fce2ea3319b76184969ad93c Mon Sep 17 00:00:00 2001 -From: Brecht Sanders (@brechtsanders) -Date: Fri, 11 Mar 2022 10:01:15 +0100 -Subject: [PATCH] fix usage of incompatible minizip data structure - ---- - code/Common/ZipArchiveIOSystem.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp -index 9870fa9d0..685cc8b5d 100644 ---- a/code/Common/ZipArchiveIOSystem.cpp -+++ b/code/Common/ZipArchiveIOSystem.cpp -@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { - zlib_filefunc_def mapping; - - mapping.zopen_file = (open_file_func)open; -+#ifdef ZOPENDISK64 - mapping.zopendisk_file = (opendisk_file_func)opendisk; -+#endif - mapping.zread_file = (read_file_func)read; - mapping.zwrite_file = (write_file_func)write; - mapping.ztell_file = (tell_file_func)tell; --- -2.34.1 - diff --git a/assimp.spec b/assimp.spec index f917fafff82cbc452b6caaf295304a9c7a30e42c..bbfdafa5fb102e0739f59a13c58821988e985d8b 100644 --- a/assimp.spec +++ b/assimp.spec @@ -1,13 +1,12 @@ Name: assimp -Version: 5.2.4 +Version: 5.2.5 Release: 1 Summary: Library to load and process various 3D model formats into applications. License: BSD and MIT and LGPL-2.1 and LGPL-2.0 and GPL-2.0 and LGPL-3.0 and GPL-3.0 URL: http://www.assimp.org/ Source0: https://github.com/assimp/assimp/archive/v%{version}.tar.gz -Patch0001: 0001-Fix-build-with-zlib.patch BuildRequires: gcc-c++ boost-devel cmake dos2unix irrlicht-devel irrXML-devel -BuildRequires: doxygen poly2tri-devel gtest-devel pkgconfig(zzip-zlib-config) +BuildRequires: doxygen poly2tri-devel gtest-devel pkgconfig(zziplib) BuildRequires: pkgconfig(zlib) pkgconfig(minizip) gmock-devel make BuildRequires: pkgconfig(python3) python3-rpm-macros Provides: bundled(polyclipping) = 4.8.8 bundled(openddl-parser) @@ -66,7 +65,6 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass %files %doc CREDITS LICENSE -%{_bindir}/assimp %{_libdir}/*.so.* %files devel @@ -83,6 +81,9 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass %{python3_sitelib}/pyassimp %changelog +* Sat Feb 04 2023 wenchaofan <349464272@qq.com> - 5.2.5-1 +- Update to 5.2.5 version + * Wed Jun 15 2022 wulei - 5.2.4-1 - Upgrade to 5.2.4 diff --git a/v5.2.4.tar.gz b/v5.2.5.tar.gz similarity index 81% rename from v5.2.4.tar.gz rename to v5.2.5.tar.gz index 01d8ee03bdb7f92b4b96996e6f61fdcd3e36f255..9080d11958bb3a73224a8243d7df66f01bb2bbb4 100644 Binary files a/v5.2.4.tar.gz and b/v5.2.5.tar.gz differ