summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Swagar2017-01-12 02:28:16 -0800
committerTyler Swagar2017-01-12 02:28:16 -0800
commita05869340757a0d12ea6f65af04772d559d63a72 (patch)
tree0ac095cf68024acc88be551b4ba2f7946406dad6
parenta87459840c27dac848f428483d3047bb80b81afa (diff)
downloadaur-a05869340757a0d12ea6f65af04772d559d63a72.tar.gz
Add conflict with ttf-google-fonts-opinionated-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec2710446e0c..c56a7814a649 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Jan 11 02:28:24 UTC 2017
+# Thu Jan 12 10:26:32 UTC 2017
pkgbase = ttf-oswald
pkgdesc = Sans-serif typeface from Google by Vernon Adams
pkgver = 4.0
@@ -12,6 +12,7 @@ pkgbase = ttf-oswald
depends = xorg-fonts-encodings
depends = xorg-font-utils
conflicts = ttf-google-fonts-git
+ conflicts = ttf-google-fonts-opinionated-git
source = https://github.com/google/fonts/raw/master/ofl/oswald/Oswald-Bold.ttf
source = https://github.com/google/fonts/raw/master/ofl/oswald/Oswald-ExtraLight.ttf
source = https://github.com/google/fonts/raw/master/ofl/oswald/Oswald-Light.ttf
diff --git a/PKGBUILD b/PKGBUILD
index 393dd6bd9d0d..7c81ecb97581 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
url='https://fonts.google.com/specimen/Oswald'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-conflicts=('ttf-google-fonts-git')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git')
install="${pkgname}.install"
source=('https://github.com/google/fonts/raw/master/ofl/oswald/Oswald-Bold.ttf'
'https://github.com/google/fonts/raw/master/ofl/oswald/Oswald-ExtraLight.ttf'