Merge pull request #12151 from suvari/master

minizip-ng: version bump to 4.0.0

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_PROJECT_SUFFIX='-ng' \
-    -DMZ_ZSTD=OFF \
+        -DBUILD_SHARED_LIBS=ON")
-    -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/minizip/zip.h")
-    pisitools.remove("/usr/include/unzip.h")
+    pisitools.remove("/usr/include/minizip/unzip.h")
 
     pisitools.dodoc("LICENSE", "README*")

util/archive/minizip-ng/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>minizip-ng</Name>
@@ -13,12 +13,13 @@
         <Summary>Fork of the popular zip manipulation library found in the zlib distribution</Summary>
         <Icon>minizip-ng</Icon>
         <Description>Fork of the popular zip manipulation library found in the zlib distribution</Description>
-        <Archive sha1sum="0c78275647f62218c8a41131978a967d9894f597" type="targz">https://github.com/zlib-ng/minizip-ng/archive/refs/tags/3.0.10.tar.gz</Archive>
+        <Archive sha1sum="753637cd8a1024f0dc909b05d11ece9e1bc02401" type="targz">https://github.com/zlib-ng/minizip-ng/archive/refs/tags/4.0.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>bzip2</Dependency>
             <Dependency>cmake</Dependency>
             <Dependency>xz-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
+            <Dependency>zstd-devel</Dependency>
             <Dependency>openssl-devel</Dependency>
         </BuildDependencies>
         <!--
@@ -34,11 +35,12 @@
         <RuntimeDependencies>
             <Dependency>xz</Dependency>
             <Dependency>zlib</Dependency>
+            <Dependency>zstd</Dependency>
             <Dependency>bzip2</Dependency>
             <Dependency>openssl</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/libminizip.so*</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
@@ -47,16 +49,24 @@
         <Name>minizip-ng-devel</Name>
         <Summary>Development files for minizip-ng</Summary>
         <RuntimeDependencies>
+            <Dependency>zlib-devel</Dependency>
             <Dependency release="current">minizip-ng</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="header">/usr/include</Path>
+            <Path fileType="header">/usr/include/minizip</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2023-07-13</Date>
+            <Version>4.0.0</Version>
+            <Comment>Version bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="1">
             <Date>2023-05-01</Date>
             <Version>3.0.10</Version>

util/archive/minizip-ng/translations.xml

@@ -2,7 +2,7 @@
 <PISI>
     <Source>
         <Name>minizip-ng</Name>
-        <Summary xml:lang="tr">Fork of the popular zip manipulation library found in the zlib distribution</Summary>
+        <Summary xml:lang="tr">Zlib dağıtımında bulunan popüler zip manipülasyon kitaplığının çatalı</Summary>
-        <Description xml:lang="tr">Fork of the popular zip manipulation library found in the zlib distribution</Description>
+        <Description xml:lang="tr">Zlib dağıtımında bulunan popüler zip manipülasyon kitaplığının çatalı</Description>
     </Source>
 </PISI>