Merge pull request #7489 from suvari/master

iso-codes: version bump to 4.4, split iso-codes-devel

office/misc/iso-codes/actions.py

@@ -9,8 +9,8 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
 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")
+    #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")
 
 def build():
@@ -18,7 +18,7 @@ def build():
 
 def install():
     autotools.install()
-    #pisitools.domove("/usr/share/pkgconfig/iso-codes.pc","/usr/lib/pkgconfig")
-    #pisitools.removeDir("/usr/share/pkgconfig")
+    pisitools.domove("/usr/share/pkgconfig/iso-codes.pc","/usr/lib/pkgconfig")
+    pisitools.removeDir("/usr/share/pkgconfig")
 
-    pisitools.dodoc("ChangeLog","TODO")
+    pisitools.dodoc("COPYING","TODO","README.md")

office/misc/iso-codes/pspec.xml

@@ -12,9 +12,9 @@
         <IsA>library</IsA>
         <Summary>International country codes</Summary>
         <Description>iso-codes provides IS0-639_3, ISO-4127, ISO-3166, ISO-3166_2, ISO-15924 standards.</Description>
-        <Archive sha1sum="acdff5b736fda1ee952e919ec055be274aabb479" type="tarxz">https://ftp.osuosl.org/pub/blfs/conglomeration/iso-codes/iso-codes-3.79.tar.xz</Archive>
+        <Archive sha1sum="838710a6589d3fed8e29ce750a7e93cf5ab6685e" type="tarxz">https://ftp.osuosl.org/pub/blfs/conglomeration/iso-codes/iso-codes-4.4.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>python3</Dependency>
+            <Dependency>python3-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -22,7 +22,7 @@
         <Name>iso-codes</Name>
         <Files>
             <!-- FIXME: split the package to iso-codes-devel in the next Pisi Linux release -->
-            <Path fileType="library">/usr/lib/pkgconfig</Path>
+<!--             <Path fileType="library">/usr/lib/pkgconfig</Path> -->
             <Path fileType="localedata">/usr/share/locale</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/xml</Path>
@@ -30,7 +30,26 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>iso-codes-devel</Name>
+        <Summary>Development files for iso-codes</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">iso-codes</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="7">
+            <Date>2020-01-11</Date>
+            <Version>4.4</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="6">
             <Date>2019-01-15</Date>
             <Version>3.79</Version>
@@ -74,4 +93,4 @@
             <Email>vedat@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>