add ttf-twemoji as conflict and fix some issue in PKGBUILD

1 files changed, 10 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 48482d72310a..1d149d922d26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,16 @@
 
 pkgname=ttf-emojione
 pkgver=3.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Official colorful EmojiOne font"
 url="https://github.com/emojione/emojione-assets"
 arch=(any)
 license=(custom)
 depends=('fontconfig')
-conflicts=('noto-fonts-emoji' 'ttf-emojione-color')
+conflicts=('ttf-emoji' 'noto-fonts-emoji' 'ttf-emojione-color' 'ttf-twemoji')
+provides=('ttf-emoji')
 replaces=('emojione-fonts')
-source=("https://github.com/emojione/emojione-assets/releases/download/${pkgver}/emojione-android.ttf"
+source=("emojione-android-${pkgver}.ttf::https://github.com/emojione/emojione-assets/releases/download/${pkgver}/emojione-android.ttf"
         "70-emojione-color.conf"
         "license-free.pdf")
 sha256sums=('6efb1a43873876bcc9476562e20cf8d875eca20bab456d83a580f46a39321139'
@@ -19,12 +20,10 @@ sha256sums=('6efb1a43873876bcc9476562e20cf8d875eca20bab456d83a580f46a39321139'
             '2898feeb41e03acd1a655ba5ddad0072aac83a014ee184fdcdebc7a66d353650')
 
 package() {
-    install -d "$pkgdir/usr/share/fonts/${pkgname%-fonts}"
-    install -d "$pkgdir/etc/fonts/"{conf.d,conf.avail}
-    install -t "$pkgdir/usr/share/fonts/${pkgname%-fonts}" -m644 emojione-android.ttf
-    install -t "$pkgdir/etc/fonts/conf.avail/" -m644 70-emojione-color.conf
-    ln -sf ../conf.avail/70-emojione-color.conf $pkgdir/etc/fonts/conf.d/70-emojione-color.conf
-    install -Dm644 license-free.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pdf"
+  install -d "${pkgdir}/etc/fonts/"{conf.d,conf.avail}
+  install -Dm644 emojione-android-${pkgver}.ttf "${pkgdir}/usr/share/fonts/emojione/emojione.ttf" 
+  install -t "${pkgdir}/etc/fonts/conf.avail/" -m644 70-emojione-color.conf
+  ln -sf ../conf.avail/70-emojione-color.conf ${pkgdir}/etc/fonts/conf.d/70-emojione-color.conf
+  install -Dm644 license-free.pdf "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf"
 }
-
-# vim:set ts=4 sw=4 et:
+# vim:set ts=2 sw=2 et: