(#18465) minizip-ng: fix duplicate provides with mz_compatibility=Tru…

…e, update dependencies

recipes/minizip-ng/all/conanfile.py

@@ -73,8 +73,6 @@ def configure(self):
             self.options.rm_safe("fPIC")
         self.settings.rm_safe("compiler.cppstd")
         self.settings.rm_safe("compiler.libcxx")
-        if self.options.mz_compatibility:
-            self.provides = "minizip"
         if self.options.get_safe("with_libcomp"):
             del self.options.with_zlib
 
@@ -98,7 +96,7 @@ def requirements(self):
 
     def build_requirements(self):
         if self._needs_pkg_config:
-            self.tool_requires("pkgconf/1.9.3")
+            self.tool_requires("pkgconf/1.9.5")
         if Version(self.version) >= "4.0.0":
             self.tool_requires("cmake/[>=3.19 <4]")
 
@@ -177,7 +175,8 @@ def package_info(self):
             self.cpp_info.components["minizip"].defines.append("HAVE_BZIP2")
 
         if Version(self.version) >= "4.0.0":
-            self.cpp_info.components["minizip"].includedirs.append(os.path.join("include", "minizip-ng"))
+            minizip_dir = "minizip" if self.options.mz_compatibility else "minizip-ng"
+            self.cpp_info.components["minizip"].includedirs.append(os.path.join(self.package_folder, "include", minizip_dir))
 
         # TODO: to remove in conan v2 once cmake_find_package_* generators removed
         self.cpp_info.filenames["cmake_find_package"] = "minizip"
@@ -203,5 +202,3 @@ def package_info(self):
         if self.settings.os != "Windows" and self.options.with_iconv:
             self.cpp_info.components["minizip"].requires.append("libiconv::libiconv")
 
-
-