Merge pull request #18914 from Rmys/master

iso-code ver. bump

office/misc/iso-codes/actions.py

@@ -7,19 +7,20 @@
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools
 from pisi.actionsapi import get
 
 def setup():
     #shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.in")
     #shelltools.system("sed -i 's|$(datadir)/pkgconfig|$(libdir)/pkgconfig|g' Makefile.am")
-    autotools.configure("--prefix=/usr")
+    mesontools.configure()
 
 def build():
-    autotools.make()
+    mesontools.build()
 
 def install():
-    autotools.rawInstall("DESTDIR=%s pkgconfigdir=/usr/lib/pkgconfig" %get.installDIR())
-    #pisitools.domove("/usr/share/pkgconfig/iso-codes.pc","/usr/lib/pkgconfig")
-    #pisitools.removeDir("/usr/share/pkgconfig")
+    mesontools.install()
+    pisitools.domove("/usr/share/pkgconfig/iso-codes.pc","/usr/lib/pkgconfig")
+    pisitools.removeDir("/usr/share/pkgconfig")
 
-    pisitools.dodoc("COPYING","TODO","README.md")
+    pisitools.dodoc("TODO*","README.md")

office/misc/iso-codes/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://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>iso-codes</Name>
@@ -14,6 +14,7 @@
         <Description>iso-codes provides IS0-639_3, ISO-4127, ISO-3166, ISO-3166_2, ISO-15924 standards.</Description>
         <Archive sha1sum="0844500f5d533991c4fec9b152dfbc6fc8457fde" type="tarbz2">https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v4.20.1/iso-codes-v4.20.1.tar.bz2</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>python3-devel</Dependency>
         </BuildDependencies>
     </Source>