summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lass2015-08-21 15:58:19 +0200
committerMichael Lass2015-08-21 15:59:10 +0200
commited816f9c243206c3fa1ec74c6dcbdb65b685d5c5 (patch)
treef238d8d347ff11600fc81ebef336c53fc10900fa
parent522e69bdb090033548e93c174e1896ad6cfb7e70 (diff)
downloadaur-ed816f9c243206c3fa1ec74c6dcbdb65b685d5c5.tar.gz
Extend provides and conflicts
This package also provides the international fonts included in the ttf-ms-win8-* packages, so include them here. Thanks to FadeMind for pointing this out! :)
-rw-r--r--.SRCINFO26
-rw-r--r--PKGBUILD6
2 files changed, 26 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a690ee70d6a..3cf5d317695 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ttf-ms-win10
pkgdesc = Microsoft Windows 10 TrueType fonts
pkgver = 10.0.10240
- pkgrel = 1
+ pkgrel = 2
url = http://www.microsoft.com/typography/fonts/product.aspx?PID=164
install = ttf-ms-win10.install
arch = any
@@ -11,16 +11,36 @@ pkgbase = ttf-ms-win10
depends = xorg-mkfontscale
depends = xorg-mkfontdir
provides = ttf-font
- provides = ttf-ms-fonts
provides = ttf-tahoma
+ provides = ttf-ms-fonts
provides = ttf-vista-fonts
provides = ttf-win7-fonts
provides = ttf-ms-win8
- conflicts = ttf-ms-fonts
+ provides = ttf-ms-win8-arabic
+ provides = ttf-ms-win8-hebrew
+ provides = ttf-ms-win8-indic
+ provides = ttf-ms-win8-japanese
+ provides = ttf-ms-win8-korean
+ provides = ttf-ms-win8-other
+ provides = ttf-ms-win8-sea
+ provides = ttf-ms-win8-thai
+ provides = ttf-ms-win8-zh_cn
+ provides = ttf-ms-win8-zh_tw
conflicts = ttf-tahoma
+ conflicts = ttf-ms-fonts
conflicts = ttf-vista-fonts
conflicts = ttf-win7-fonts
conflicts = ttf-ms-win8
+ conflicts = ttf-ms-win8-arabic
+ conflicts = ttf-ms-win8-hebrew
+ conflicts = ttf-ms-win8-indic
+ conflicts = ttf-ms-win8-japanese
+ conflicts = ttf-ms-win8-korean
+ conflicts = ttf-ms-win8-other
+ conflicts = ttf-ms-win8-sea
+ conflicts = ttf-ms-win8-thai
+ conflicts = ttf-ms-win8-zh_cn
+ conflicts = ttf-ms-win8-zh_tw
pkgname = ttf-ms-win10
diff --git a/PKGBUILD b/PKGBUILD
index 0395b04ca04..d67b12b0120 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,14 +50,14 @@
pkgname=ttf-ms-win10
pkgver=10.0.10240
-pkgrel=1
+pkgrel=2
pkgdesc="Microsoft Windows 10 TrueType fonts"
arch=('any')
url='http://www.microsoft.com/typography/fonts/product.aspx?PID=164'
license=('custom')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir')
-provides=('ttf-font' 'ttf-ms-fonts' 'ttf-tahoma' 'ttf-vista-fonts' 'ttf-win7-fonts' 'ttf-ms-win8')
-conflicts=('ttf-ms-fonts' 'ttf-tahoma' 'ttf-vista-fonts' 'ttf-win7-fonts' 'ttf-ms-win8')
+provides=(ttf-font ttf-tahoma ttf-{ms,vista,win7}-fonts ttf-ms-win8{,-arabic,-hebrew,-indic,-japanese,-korean,-other,-sea,-thai,-zh_cn,-zh_tw})
+conflicts=(ttf-tahoma ttf-{ms,vista,win7}-fonts ttf-ms-win8{,-arabic,-hebrew,-indic,-japanese,-korean,-other,-sea,-thai,-zh_cn,-zh_tw})
install="${pkgname}.install"
_fonts=(