Fix split package dependencies

2 files changed, 10 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b72e42097ef..529794c1103f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
 pkgbase = alibaba-puhuiti
 	pkgdesc = Alibaba PuHuiTi fonts
 	pkgver = 2.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://ics.alibaba.com/font/alibaba-sans
 	arch = any
 	license = custom
-	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
@@ -19,9 +17,10 @@ pkgname = otf-alibaba-puhuiti
 pkgname = ttf-alibaba-puhuiti
 	pkgdesc = Alibaba PuHuiTi fonts - TTF format
 	depends = alibaba-puhuiti-fontconfig
-	provides = alibaba-sans
 	provides = alibaba-puhuiti
+	provides = alibaba-sans
 	replaces = alibaba-puhuiti
+	replaces = alibaba-sans
 
 pkgname = alibaba-puhuiti-fontconfig
 	pkgdesc = Alibaba PuHuiTi fonts - Fontconfig configuration
diff --git a/PKGBUILD b/PKGBUILD
index 0b71f2b7bdd8..01bf50a7a808 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
-# Maintainer: Yangtse Su <yangtsesu@gmail.com>
+# Maintainer: Adrian Perez de Castro <aperez@igalia.com>
+# Contributor: Yangtse Su <yangtsesu@gmail.com>
 
 pkgbase=alibaba-puhuiti
 pkgname=({otf,ttf}-alibaba-puhuiti alibaba-puhuiti-fontconfig)
 pkgver=2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Alibaba PuHuiTi fonts"
 arch=(any)
 license=(custom)
 url=https://ics.alibaba.com/font/alibaba-sans
-provides=(alibaba-sans)
-conflicts=(alibaba-sans)
 source=("alibaba-puhuiti-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font${pkgver}.zip"
          75-alibaba.conf)
 sha512sums=('b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47'
@@ -36,15 +35,15 @@ _package_common () {
 
 package_otf-alibaba-puhuiti () {
 	pkgdesc="$pkgdesc - OTF format"
-	depends+=(alibaba-puhuiti-fontconfig)
+	depends=(alibaba-puhuiti-fontconfig)
 	_package_common otf/*.otf
 }
 
 package_ttf-alibaba-puhuiti () {
 	pkgdesc="$pkgdesc - TTF format"
-	provides+=(alibaba-puhuiti)
-	replaces+=(alibaba-puhuiti)
-	depends+=(alibaba-puhuiti-fontconfig)
+	provides=(alibaba-puhuiti alibaba-sans)
+	replaces=(alibaba-puhuiti alibaba-sans)
+	depends=(alibaba-puhuiti-fontconfig)
 	_package_common ttf/*.ttf
 }