Update to version 1.2.1-2

3 files changed, 15 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5cad151fc22..6685d99aac07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,14 @@
 pkgbase = ttf-meslo
-	pkgdesc = Meslo LG is a customized version of Apple's Menlo font (includes DZ version)
+	pkgdesc = Meslo LG is a customized version of Apple's Menlo font with various line gap and dotted zero
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://github.com/andreberg/Meslo-Font
-	install = ttf-meslo.install
 	arch = any
 	license = Apache
-	depends = fontconfig
-	depends = xorg-font-utils
-	source = Meslo-1.2.1.zip::https://github.com/andreberg/Meslo-Font/blob/master/dist/v1.2.1/Meslo%20LG%20v1.2.1.zip?raw=true
-	source = Meslo-1.2.1-DZ.zip::https://github.com/andreberg/Meslo-Font/blob/master/dist/v1.2.1/Meslo%20LG%20DZ%20v1.2.1.zip?raw=true
-	sha256sums = d0bcb7668dda8fa1a0f8162d626adb434c32854e243b5bd52a717cf569af08d0
-	sha256sums = e5201a6816281872c23a2b2f43ac91dc8c1f9d91e9f4b82d64e9bfcb769ecb52
+	source = ttf-meslo-1.2.1.zip::http://github.com/andreberg/Meslo-Font/blob/master/dist/v1.2.1/Meslo%20LG%20v1.2.1.zip?raw=true
+	source = ttf-meslo-dz-1.2.1.zip::http://github.com/andreberg/Meslo-Font/blob/master/dist/v1.2.1/Meslo%20LG%20DZ%20v1.2.1.zip?raw=true
+	md5sums = 07615beca5ddd4d2cf1d789518c6a292
+	md5sums = e4ab271b44d1a36812170f916282aa45
 
 pkgname = ttf-meslo
 
diff --git a/PKGBUILD b/PKGBUILD
index 3ea1a93902a5..b5fe23cd5749 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,22 @@
-# Maintainer: pzl <alsoelp@gmail.com>
+# Maintainer: Kewl <xrjy@nygb.rh.bet(rot13)>
+# Contributor: pzl <alsoelp@gmail.com>
 # Contributor: Pablo Olmos de Aguilera C. <pablo at glatelier dot org>
 # Contributor: David Goodlad <david at goodlad dot ca>
 # Contributor: William Sheldon <tang0th at gmx dot com>
 
 pkgname=ttf-meslo
-_pkgname=Meslo
 pkgver=1.2.1
-pkgrel=1
-pkgdesc="Meslo LG is a customized version of Apple's Menlo font (includes DZ version)"
+pkgrel=2
+pkgdesc="Meslo LG is a customized version of Apple's Menlo font with various line gap and dotted zero"
 arch=('any')
 url="http://github.com/andreberg/Meslo-Font"
 license=('Apache')
-depends=('fontconfig' 'xorg-font-utils')
-install=ttf-meslo.install
-source=(
-$_pkgname-${pkgver}.zip::https://github.com/andreberg/Meslo-Font/blob/master/dist/v${pkgver}/Meslo%20LG%20v${pkgver}.zip?raw=true
-$_pkgname-${pkgver}-DZ.zip::https://github.com/andreberg/Meslo-Font/blob/master/dist/v${pkgver}/Meslo%20LG%20DZ%20v${pkgver}.zip?raw=true
-)
-sha256sums=('d0bcb7668dda8fa1a0f8162d626adb434c32854e243b5bd52a717cf569af08d0'
-            'e5201a6816281872c23a2b2f43ac91dc8c1f9d91e9f4b82d64e9bfcb769ecb52')
+source=(${pkgname}-${pkgver}.zip::${url}/blob/master/dist/v${pkgver}/Meslo%20LG%20v${pkgver}.zip?raw=true
+        ${pkgname}-dz-${pkgver}.zip::${url}/blob/master/dist/v${pkgver}/Meslo%20LG%20DZ%20v${pkgver}.zip?raw=true)
+md5sums=('07615beca5ddd4d2cf1d789518c6a292'
+         'e4ab271b44d1a36812170f916282aa45')
 
 package()
 {
-  install -d $pkgdir/usr/share/fonts/TTF/
-  install -m644 $srcdir/Meslo\ LG\ v$pkgver/*.ttf $pkgdir/usr/share/fonts/TTF/
-  install -m644 $srcdir/Meslo\ LG\ DZ\ v$pkgver/*.ttf $pkgdir/usr/share/fonts/TTF/
+    install -Dm644 Meslo\ LG\ {DZ\ ,}v${pkgver}/*.ttf -t "${pkgdir}/usr/share/fonts/TTF"
 }
diff --git a/ttf-meslo.install b/ttf-meslo.install
deleted file mode 100644
index 2dc1d4132ca5..000000000000
--- a/ttf-meslo.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f -s > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et: