Add conflict with ttf-google-fonts-git

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b084f60447d..ec2710446e0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Jan  9 21:25:29 UTC 2017
+# Wed Jan 11 02:28:24 UTC 2017
 pkgbase = ttf-oswald
 	pkgdesc = Sans-serif typeface from Google by Vernon Adams
 	pkgver = 4.0
@@ -11,6 +11,7 @@ pkgbase = ttf-oswald
 	depends = fontconfig
 	depends = xorg-fonts-encodings
 	depends = xorg-font-utils
+	conflicts = ttf-google-fonts-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 bdf9cf6d090a..393dd6bd9d0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +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')
 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'