diff --git a/util/archive/minizip-ng/actions.py b/util/archive/minizip-ng/actions.py index 1a96447fd7..c218ab1c66 100644 --- a/util/archive/minizip-ng/actions.py +++ b/util/archive/minizip-ng/actions.py @@ -6,21 +6,22 @@ from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools from pisi.actionsapi import get def setup(): cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ - -DMZ_PROJECT_SUFFIX='-ng' \ - -DMZ_ZSTD=OFF \ - -DBUILD_SHARED_LIBS=ON") + -DMZ_PROJECT_SUFFIX='-ng' \ + -DBUILD_SHARED_LIBS=ON") def build(): + # shelltools.system("cmake -B build -S minizip-4.0.0") cmaketools.make() def install(): cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.remove("/usr/include/zip.h") - pisitools.remove("/usr/include/unzip.h") + pisitools.remove("/usr/include/minizip/zip.h") + pisitools.remove("/usr/include/minizip/unzip.h") pisitools.dodoc("LICENSE", "README*") diff --git a/util/archive/minizip-ng/pspec.xml b/util/archive/minizip-ng/pspec.xml index 473a65f280..a29bb50e7f 100644 --- a/util/archive/minizip-ng/pspec.xml +++ b/util/archive/minizip-ng/pspec.xml @@ -1,5 +1,5 @@ - + minizip-ng @@ -13,12 +13,13 @@ Fork of the popular zip manipulation library found in the zlib distribution minizip-ng Fork of the popular zip manipulation library found in the zlib distribution - https://github.com/zlib-ng/minizip-ng/archive/refs/tags/3.0.10.tar.gz + https://github.com/zlib-ng/minizip-ng/archive/refs/tags/4.0.0.tar.gz bzip2 cmake xz-devel zlib-devel + zstd-devel openssl-devel