From 6778cf345e959589c1da8d3d6a2f9e23d658d3d9 Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sun, 2 Feb 2025 00:38:34 +0800
Subject: [PATCH] add requires on zlib and minizip devel pacakge

(cherry picked from commit dd9af67cb95d7f3890fdb0c2728bc173e325191c)
---
 assimp.spec | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/assimp.spec b/assimp.spec
index a309653..35a8254 100644
--- a/assimp.spec
+++ b/assimp.spec
@@ -1,6 +1,6 @@
 Name:          assimp
 Version:       5.3.1
-Release:       6
+Release:       7
 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/
@@ -21,6 +21,7 @@ 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)
+Obsoletes:     %{name}-help < %{version}-%{release}
 
 %description
 Assimp is a library to load and process geometric scenes from various data formats.
@@ -31,6 +32,8 @@ to this purpose.
 %package       devel
 Summary:       Headers and libraries for assimp
 Requires:      assimp = %{version}-%{release}
+Requires:      zlib-devel%{?_isa}
+Requires:      pkgconfig(minizip)
 
 %description devel
 This package provides the header files and libraries
@@ -46,15 +49,6 @@ Obsoletes:     assimp-python3 < 3.1.1
 %description -n python3-assimp
 This package provides the PyAssimp3 python bindings
 
-%package       help
-Summary:       Assimp help doc
-BuildArch:     noarch
-Provides:      assimp-doc = %{version}-%{release}
-Obsoletes:     assimp-doc < %{version}-%{release}
-
-%description   help
-Assimp help doc.
-
 %prep
 %autosetup -n assimp-%{version} -p1
 
@@ -69,14 +63,9 @@ Assimp help doc.
 install -d %{buildroot}%{python3_sitelib}/pyassimp/
 install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyassimp/
 
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
 %files
-%doc CREDITS LICENSE
+%license LICENSE
+%doc CREDITS
 %{_libdir}/*.so.*
 %{_bindir}/assimp
 
@@ -86,14 +75,16 @@ install -m 0644 port/PyAssimp/pyassimp/*.py %{buildroot}%{python3_sitelib}/pyass
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/cmake/*
 
-%files help
-%{_docdir}/*
-
 %files -n python3-assimp
 %doc port/PyAssimp/README.md
 %{python3_sitelib}/pyassimp
 
 %changelog
+* Sun Feb 02 2025 Funda Wang <fundawang@yeah.net> - 5.3.1-7
+- add requires on zlib and minizip devel pacakge, as it was referenced by
+  pkgconfig and cmake description files
+- drop help sub package, as it conflicts with main package
+
 * Tue Oct 29 2024 xuezhixin <xuezhixin@uniontech.com> - 5.3.1-6
 - use the new cmake macros
 
-- 
Gitee