updpkg, split conf

5 files changed, 68 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e4d4d84353f..eb01ecdbb6f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ttf-twcns-fonts
 	pkgdesc = Chinese TrueType fonts by Ministry of Education of Taiwan government, support CNS11643 standard, including Kai and Sung fontface.
-	pkgver = 20210705
+	pkgver = 20210911
 	pkgrel = 1
 	url = https://data.gov.tw/node/5961
 	arch = any
@@ -9,11 +9,13 @@ pkgbase = ttf-twcns-fonts
 	makedepends = convmv
 	makedepends = wget
 	source = https://www.cns11643.gov.tw/AIDB/Open_Data.zip
-	source = 53-twcns.conf
+	source = 46-twcns.conf
+	source = 66-twcns.conf
 	source = LICENSE-zh_TW
 	source = LICENSE
-	sha256sums = 7c20fe628a1efd75fe0b2a91717e4a2e5c52cf42b5c6d3495dff8d4416b34c23
-	sha256sums = 2ec096a29e801e668785d85b08e5b7f8ec7c79535df5289d6ce4b09674594a7d
+	sha256sums = 4665cf5f3b301b27fa851448b4daeac09c87aaed09856f52cf9f20722e77aa4f
+	sha256sums = 70345fd5ef20a8c290805a89e40a7b74f42b725f07590337ac171511a1014bbf
+	sha256sums = fc7ca074ccbd4ab8fa01b99cf03182247b3ae25586300a7ecc015a790eafedbe
 	sha256sums = 5752216377a7b59433b2cc83164be2f93533446e72953a1d4769ceddd1349a00
 	sha256sums = 114afb4ba741595b69fbabb5e1d6668f095bbe4acfee5e5358d83cfbc72f1351
 
diff --git a/46-twcns.conf b/46-twcns.conf
new file mode 100644
index 000000000000..0ddf7db2b5e9
--- /dev/null
+++ b/46-twcns.conf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>TW Sung</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>TW Kai</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <alias>
+    <family>TW Sung</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
+
diff --git a/53-twcns.conf b/53-twcns.conf
deleted file mode 100644
index b96405975417..000000000000
--- a/53-twcns.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <alias>
-    <family>serif</family>
-    <prefer>
-      <family>TW Sung</family>
-        <family>TW Sung Ext-B</family>
-        <family>TW Sung Plus</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-        <family>TW Kai</family>
-        <family>TW Kai Ext-B</family>
-        <family>TW Kai Plus</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>monospace</family>
-    <prefer>
-      <family>TW Sung</family>
-      <family>TW Sung Ext-B</family>
-      <family>TW Sung Plus</family>
-    </prefer>
-  </alias>
-
-  <alias>
-    <family>TW Sung</family>
-    <default>
-      <family>serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>TW Kai</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-  <alias>
-    <family>TW Sung</family>
-    <default>
-      <family>monospace</family>
-    </default>
-  </alias>
-</fontconfig>
diff --git a/66-twcns.conf b/66-twcns.conf
new file mode 100644
index 000000000000..f026273a92da
--- /dev/null
+++ b/66-twcns.conf
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>TW Sung</family>
+      <family>TW Sung Ext-B</family>
+      <family>TW Sung Plus</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>TW Kai</family>
+      <family>TW Kai Ext-B</family>
+      <family>TW Kai Plus</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>TW Sung</family>
+      <family>TW Sung Ext-B</family>
+      <family>TW Sung Plus</family>
+    </prefer>
+  </alias>
+</fontconfig>
+
diff --git a/PKGBUILD b/PKGBUILD
index 7a3539a592b8..344195422db1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,18 @@
 pkgbase=ttf-twcns-fonts
 pkgname=(${pkgbase}{,-doc})
 pkgdesc='Chinese TrueType fonts by Ministry of Education of Taiwan government, support CNS11643 standard, including Kai and Sung fontface.'
-pkgver=20210705
+pkgver=20210911
 pkgrel=1
 arch=('any')
 url='https://data.gov.tw/node/5961'
 license=('custom')
 makedepends=(dos2unix convmv wget)
 source=('https://www.cns11643.gov.tw/AIDB/Open_Data.zip'
-        '53-twcns.conf' # grab from older version of rpm
-        'LICENSE-zh_TW'
-        'LICENSE')
-sha256sums=('7c20fe628a1efd75fe0b2a91717e4a2e5c52cf42b5c6d3495dff8d4416b34c23'
-            '2ec096a29e801e668785d85b08e5b7f8ec7c79535df5289d6ce4b09674594a7d'
+        '46-twcns.conf' '66-twcns.conf'
+        'LICENSE-zh_TW' 'LICENSE')
+sha256sums=('4665cf5f3b301b27fa851448b4daeac09c87aaed09856f52cf9f20722e77aa4f'
+            '70345fd5ef20a8c290805a89e40a7b74f42b725f07590337ac171511a1014bbf'
+            'fc7ca074ccbd4ab8fa01b99cf03182247b3ae25586300a7ecc015a790eafedbe'
             '5752216377a7b59433b2cc83164be2f93533446e72953a1d4769ceddd1349a00'
             '114afb4ba741595b69fbabb5e1d6668f095bbe4acfee5e5358d83cfbc72f1351')
 #DLAGENTS=('https::/usr/bin/curl -gqb "" -fLC - --retry 999 -o %o %u') # not tested yet
@@ -36,8 +36,10 @@ package_ttf-twcns-fonts() {
     mv -v Fonts/TW-Sung* "${pkgdir}"/usr/share/fonts/TTF/
     msg 'Installing configuration'
     install -dm755 "${pkgdir}"/usr/share/fontconfig/conf.default
-    install -Dm644 "${srcdir}"/53-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.avail/53-twcns.conf
-    ln -sf ../conf.avail/53-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.default/53-twcns.conf
+    install -Dm644 "${srcdir}"/46-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.avail/46-twcns.conf
+    install -Dm644 "${srcdir}"/66-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.avail/66-twcns.conf
+    ln -sf ../conf.avail/46-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.default/46-twcns.conf
+    ln -sf ../conf.avail/66-twcns.conf "${pkgdir}"/usr/share/fontconfig/conf.default/66-twcns.conf
     msg 'Installing the license'
     install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
     install -Dm644 ${srcdir}/LICENSE-zh_TW ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-zh_TW