remove noto-fonts as conflict and add it as dependencies

2 files changed, 11 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 515452b7257d..6bef304943fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 # Generated by mksrcinfo v8
-# Sun Jun 18 07:57:24 UTC 2017
+# Thu Jul  6 08:04:40 UTC 2017
 pkgbase = ttf-google-fonts-git
 	pkgdesc = TrueType fonts from the Google Fonts project (git version)
-	pkgver = 20170614
-	pkgrel = 1
+	pkgver = 20170626
+	pkgrel = 2
 	url = https://github.com/google/fonts
 	arch = any
 	license = various
 	makedepends = git
 	depends = cantarell-fonts
 	depends = fontconfig
+	depends = noto-fonts
 	depends = xorg-fonts-encodings
 	depends = xorg-mkfontdir
 	depends = xorg-mkfontscale
@@ -18,7 +19,6 @@ pkgbase = ttf-google-fonts-git
 	provides = googlefontdirectory
 	provides = jsmath-fonts
 	provides = lohit-fonts
-	provides = noto-fonts
 	provides = oldstand-font
 	provides = openarch_fonts
 	provides = otf-bitter
@@ -72,7 +72,6 @@ pkgbase = ttf-google-fonts-git
 	conflicts = googlefontdirectory
 	conflicts = jsmath-fonts
 	conflicts = lohit-fonts
-	conflicts = noto-fonts
 	conflicts = oldstand-font
 	conflicts = openarch_fonts
 	conflicts = otf-bitter
diff --git a/PKGBUILD b/PKGBUILD
index eb440eae4676..98bf918ae666 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,16 @@
 # Contributor: Alexander De Sousa <archaur.xandy21@spamgourmet.com>
 
 pkgname=ttf-google-fonts-git
-pkgver=20170614
-pkgrel=1
+pkgver=20170626
+pkgrel=2
 pkgdesc="TrueType fonts from the Google Fonts project (git version)"
 arch=('any')
 url="https://github.com/google/fonts"
 license=('various')
-# About why "cantarell-fonts" is a dependency see comment in package() function.
+# About why "cantarell-fonts" and "noto-fonts" is a dependency see comment in package() function.
 depends=('cantarell-fonts'
          'fontconfig'
+         'noto-fonts'
          'xorg-fonts-encodings'
          'xorg-mkfontdir'
          'xorg-mkfontscale')
@@ -26,7 +27,6 @@ conflicts=('adobe-source-code-pro-fonts'
            'googlefontdirectory'
            'jsmath-fonts'
            'lohit-fonts'
-           'noto-fonts'
            'oldstand-font'
            'openarch_fonts'
            'otf-bitter'
@@ -94,4 +94,7 @@ package() {
     # cantarell-fonts package installs its fonts into /usr/share/fonts/cantarell/
     # and because cantarell-fonts installs .otf files instead of .ttf files
     find ${pkgdir}/usr/share/fonts/TTF -type f -name "Cantarell-*.ttf" -delete
+    # remove Noto fonts because noto-fonts package have more fonts than this package
+    # and also noto-fonts install it's fonts in /usr/share/fonts/noto.
+    find ${pkgdir}/usr/share/fonts/TTF -type f -name "Noto*.ttf" -delete
     }