Update to version 2.0

3 files changed, 40 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ec62ccc45d7..74b5bf941797 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = alibaba-puhuiti
 	pkgdesc = Alibaba PuHuiTi fonts
-	pkgver = 1.01
-	pkgrel = 3
+	pkgver = 2.0
+	pkgrel = 1
 	url = https://ics.alibaba.com/font/alibaba-sans
 	arch = any
 	license = custom
 	makedepends = unzip
-	source = alibaba-puhuiti-1.01.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/ucan_alibaba_font.zip?spm=0.font.0.0.e21dbbcfIGV8il&file=ucan_alibaba_font.zip
-	sha512sums = e2cac62e55a96cc641516f859ea4f613d5a976725362afc4a8483d767fb19a394b34d36565e2ddb264f3986b443b7827eb641051b54355e03061b86677a23fd8
+	provides = alibaba-sans
+	conflicts = alibaba-sans
+	source = alibaba-puhuiti-2.0.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font2.0.zip
+	source = 75-alibaba.conf
+	sha512sums = b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47
+	sha512sums = f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6
 
 pkgname = alibaba-puhuiti
 
-pkgname = alibaba-sans
-	pkgdesc = Alibaba Sans fonts
-
diff --git a/75-alibaba.conf b/75-alibaba.conf
new file mode 100644
index 000000000000..dc8bda235b1b
--- /dev/null
+++ b/75-alibaba.conf
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>Alibaba Sans</family>
+		<prefer><family>Alibaba PuHuiTi 2.0</family></prefer>
+	</alias>
+</fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index 3b65a47a24bc..900b436e7fb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,39 @@
 # Maintainer: Yangtse Su <yangtsesu@gmail.com>
 
-pkgname=(alibaba-puhuiti alibaba-sans)
-pkgver=1.01
-pkgrel=3
+pkgname=alibaba-puhuiti
+pkgver=2.0
+pkgrel=1
 pkgdesc="Alibaba PuHuiTi fonts"
 arch=(any)
 license=(custom)
 url=https://ics.alibaba.com/font/alibaba-sans
 makedepends=(unzip)
-source=("$pkgname-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/ucan_alibaba_font.zip?spm=0.font.0.0.e21dbbcfIGV8il&file=ucan_alibaba_font.zip")
-sha512sums=('e2cac62e55a96cc641516f859ea4f613d5a976725362afc4a8483d767fb19a394b34d36565e2ddb264f3986b443b7827eb641051b54355e03061b86677a23fd8')
+provides=(alibaba-sans)
+conflicts=(alibaba-sans)
+source=("$pkgname-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font${pkgver}.zip"
+         75-alibaba.conf)
+sha512sums=('b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47'
+            'f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6')
 
 prepare () {
-  cd '阿里巴巴集团字体'
-  unzip -q -o -j 'AlibabaSans.zip' '*.otf' -d ../sans
-  unzip -q -o -j '阿里巴巴普惠体.zip' '*.ttf' -d ../puhuiti
+	local winzipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Win 压缩.zip'
+	local maczipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Mac 压缩.zip'
+	unzip -q -C -o -j "$winzipfile" '*.ttf' -d ttf
+	unzip -q -C -o -j "$maczipfile" '*.pdf' -d pdf
+	mv 'pdf/阿里巴巴普惠体2.0版法律声明.pdf' pdf/license.pdf
 }
 
-_install_license ()
-{
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -Dm644 '阿里巴巴集团字体/Law Policy for Alibaba Sans.pdf' \
-    "${pkgdir}/usr/share/licenses/${pkgname}"
-}
+package () {
+	install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
+	install -Dm644 pdf/license.pdf "${pkgdir}/usr/share/licenses/${pkgname}"
 
-package_alibaba-puhuiti() {
-  install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  install -Dm644 puhuiti/*.ttf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  _install_license
-}
+	install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+	install -Dm644 ttf/*.ttf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
 
-package_alibaba-sans() {
-  pkgdesc="Alibaba Sans fonts"
+	install -dm755 "${pkgdir}/usr/share/fontconfig/conf.avail"
+	install -Dm644 75-alibaba.conf "${pkgdir}/usr/share/fontconfig/conf.avail"
 
-  install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  install -Dm644 sans/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  _install_license
+	install -dm755 "${pkgdir}/usr/share/fontconfig/conf.default"
+	ln -nsf ../conf.avail/75-alibaba.conf \
+		"${pkgdir}/usr/share/fontconfig/conf.default/75-alibaba.conf"
 }