don't conflict with noto-fonts-emoji

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a14239055ced..68ac2604ad0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = noto-fonts-emoji-blob
 	pkgdesc = Google Noto emoji fonts (blob version, C1710's fork)
 	pkgver = 20180506
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/C1710/blobmoji/
 	arch = any
 	license = Apache
 	depends = fontconfig
 	provides = noto-fonts-emoji
-	conflicts = noto-fonts-emoji
 	source = https://github.com/C1710/blobmoji/raw/8b754e03bd3b2b82dd2a35632b73965fafb20ff3/fonts/NotoColorEmoji.ttf
 	sha256sums = 271f6f8a54cc9538b17d86810da21605e602200c044e10bab1662c8c5995fafd
 
diff --git a/PKGBUILD b/PKGBUILD
index ec851d9d7a00..d67138cf2a5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,17 @@
 pkgname=noto-fonts-emoji-blob
 _pkgver=2018-05-06
 pkgver=${_pkgver//-}
-pkgrel=1
+pkgrel=2
 pkgdesc="Google Noto emoji fonts (blob version, C1710's fork)"
 arch=(any)
 url="https://github.com/C1710/blobmoji/"
 license=("Apache")
 depends=(fontconfig)
 provides=(noto-fonts-emoji)
-conflicts=(noto-fonts-emoji)
 source=("https://github.com/C1710/blobmoji/raw/8b754e03bd3b2b82dd2a35632b73965fafb20ff3/fonts/NotoColorEmoji.ttf")
 sha256sums=('271f6f8a54cc9538b17d86810da21605e602200c044e10bab1662c8c5995fafd')
 
 package() {
-    mkdir -p "$pkgdir"/usr/share/fonts/noto
-    install -m644 NotoColorEmoji.ttf "$pkgdir"/usr/share/fonts/noto
+    mkdir -p "$pkgdir"/usr/share/fonts/blobmoji
+    install -m644 NotoColorEmoji.ttf "$pkgdir"/usr/share/fonts/blobmoji
 }