From d22c6d6356ce8a6557a245541e66382f400e17eb Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 13 Dec 2023 13:58:51 -0600 Subject: [PATCH 1/2] RHEL 9 fixes: revert patch macros and GCC warning suppression --- assimp.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assimp.spec b/assimp.spec index d6d4485..94ea25e 100644 --- a/assimp.spec +++ b/assimp.spec @@ -126,16 +126,15 @@ rm -r contrib/rapidjson rm -r contrib/stb rm -r contrib/utf8cpp -%patch 0 -p1 -b .unbundle -%patch 1 -p1 -b .pythonpath -%patch 2 -p1 -b .nozlib -%patch 3 -p1 -b .doxyfile -%patch 4 -p0 -b .tests +%patch0 -p1 -b .unbundle +%patch1 -p1 -b .pythonpath +%patch2 -p1 -b .nozlib +%patch3 -p1 -b .doxyfile +%patch4 -p0 -b .tests mv contrib/openddlparser/LICENSE contrib/openddlparser/LICENSE.openddlparser %build -%global optflags %(echo %{optflags} -Wno-error=dangling-reference) %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DASSIMP_LIB_INSTALL_DIR=%{_lib} \ From e20962cbb7b78168b3cb826792d52bdcdaf58ff3 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Wed, 3 Jan 2024 12:59:12 -0600 Subject: [PATCH 2/2] Add pugixml and poly2tri devel dependencies to assimp-devel --- assimp.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assimp.spec b/assimp.spec index 94ea25e..c6dd365 100644 --- a/assimp.spec +++ b/assimp.spec @@ -3,7 +3,7 @@ Name: assimp Version: 5.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library to import various 3D model formats into applications # Assimp is BSD @@ -89,6 +89,8 @@ to these applications. %package devel Summary: Header files and libraries for assimp Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: poly2tri-devel +Requires: pugixml-devel %description devel This package contains the header files and libraries @@ -196,6 +198,9 @@ rm -f %{buildroot}%{_libdir}/libzlibstatic.a %endif %changelog +* Wed Jan 03 2024 Scott K Logan - 5.2.5-2 +- Add pugixml and poly2tri devel dependencies to assimp-devel + * Fri Nov 24 2023 Rich Mattes - 5.2.5-1 - Add check section and fix ctest configuration