Cleanup packaging using vars for easy updating

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1684e821d47..7dcde1c51949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ttf-sil-abyssinica
 	pkgdesc = OpenType calligraphic font for Ethiopic languages from SIL
 	pkgver = 1.500
-	pkgrel = 1
+	pkgrel = 2
 	url = http://scripts.sil.org/cms/scripts/page.php?item_id=AbyssinicaSIL
 	install = ttf.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 4534a37d1056..e8bfaf0b7b5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,23 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=ttf-sil-abyssinica
+_fname=AbyssinicaSIL
 pkgver=1.500
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenType calligraphic font for Ethiopic languages from SIL"
 arch=('i686' 'x86_64')
-url="http://scripts.sil.org/cms/scripts/page.php?item_id=AbyssinicaSIL"
+url="http://scripts.sil.org/cms/scripts/page.php?item_id=${_fname}"
 license=('ofl')
 depends=('fontconfig' 'xorg-font-utils')
 conflicts=()
 install=ttf.install
-source=('http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=AbyssinicaSIL-1.500.zip&filename=AbyssinicaSIL-1.500.zip'
+source=("http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${_fname}-${pkgver}.zip&filename=${_fname}-${pkgver}.zip"
         'LICENSE::http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=OFL_plaintext&filename=OFL.txt')
 md5sums=('a3d943d18e303197c8d3d92d2de54d1e'
          '6ed93967ff0dc6dd9c8d31c17f817a06')
 
 package() {
     cd "${srcdir}"
-    install -Dm644 AbyssinicaSIL-1.500/AbyssinicaSIL-R.ttf ${pkgdir}/usr/share/fonts/TTF/AbyssinicaSIL-R.ttf
+    install -Dm644 ${_fname}-${pkgver}/${_fname}-R.ttf ${pkgdir}/usr/share/fonts/TTF/${_fname}-R.ttf
     install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }