summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f5c5d6e6f4c..9fe03128650 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,3 +1,5 @@
+# Generated by mksrcinfo v8
+# Thu Dec 17 07:00:08 UTC 2015
pkgbase = ttf-ms-win10
pkgver = 10.0.10586
pkgrel = 1
@@ -11,7 +13,6 @@ pkgbase = ttf-ms-win10
depends = xorg-mkfontdir
provides = ttf-font
conflicts = ttf-vista-fonts
- conflicts = ttf-win7-fonts
source = file://arial.ttf
source = file://arialbd.ttf
source = file://ariali.ttf
@@ -293,7 +294,6 @@ pkgname = ttf-ms-win10
provides = ttf-tahoma
provides = ttf-ms-fonts
conflicts = ttf-vista-fonts
- conflicts = ttf-win7-fonts
conflicts = ttf-tahoma
conflicts = ttf-ms-fonts
diff --git a/PKGBUILD b/PKGBUILD
index d32e912b23a..83774ba0aa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ 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)
-conflicts=(ttf-{vista,win7}-fonts)
+conflicts=(ttf-vista-fonts)
install=$pkgbase.install
_ttf_ms_win10=(
@@ -319,7 +319,7 @@ sha256sums=('95766b58f7d869b0fa2cf6e6feb26c1b21cdf2631f1c5863fc9bd206d5c6e8ee'
SKIP)
_package() {
- conflicts+=(${pkgname/10/8})
+ conflicts+=(${pkgname/10/8} ttf-win7-fonts${pkgname##*10})
install -Dm644 $@ -t "$pkgdir/usr/share/fonts/TTF"
install -Dm644 license.rtf -t "$pkgdir/usr/share/licenses/$pkgname"