Change source tarball to bz2

2 files changed, 28 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 969e4b59e851..cf79a84e48a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 # Generated by mksrcinfo v8
-# Sat Dec 12 17:05:52 UTC 2015
+# Wed Aug 24 05:38:19 UTC 2016
 pkgbase = ttf-georgewilliams
 	pkgdesc = Free unicode TrueType fonts by George Williams: Caliban, Caslon Roman, Cupola
 	pkgver = 1.0
-	pkgrel = 2
-	url = http://fontforge.sourceforge.net/sfds/index.html
+	pkgrel = 3
+	url = http://fontforge.github.io/sfds/
 	install = ttf-georgewilliams.install
 	arch = any
 	license = BSD
 	makedepends = unzip
 	depends = fontconfig
 	depends = xorg-font-utils
-	source = http://ftp.debian.org/debian/pool/main/g/gw-fonts-ttf/gw-fonts-ttf_1.0.orig.tar.gz
-	md5sums = 298c1e66a86ab25f013cfb68f7d9e0ba
+	source = http://ftp.debian.org/debian/pool/main/g/gw-fonts-ttf/gw-fonts-ttf_1.0.orig.tar.bz2
+	md5sums = e81446f5c03ed00fb280072eb75252e6
 
 pkgname = ttf-georgewilliams
 
diff --git a/PKGBUILD b/PKGBUILD
index fe1e46cefc61..8d0f405eaf20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,37 @@
 # Contributor: Anton Leontyev <scileont /at/ gmail.com>
 pkgname=ttf-georgewilliams
 pkgver=1.0
-pkgrel=2
-pkgdesc="Free unicode TrueType fonts by George Williams: Caliban, Caslon Roman, Cupola"
+pkgrel=3
+pkgdesc='Free unicode TrueType fonts by George Williams: Caliban, Caslon Roman, Cupola'
 arch=('any')
 license=('BSD')
-url="http://fontforge.sourceforge.net/sfds/index.html" 
+url='http://fontforge.github.io/sfds/'
 makedepends=('unzip')
 depends=('fontconfig' 'xorg-font-utils')
 #depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
 install=ttf-georgewilliams.install
-source=(http://ftp.debian.org/debian/pool/main/g/gw-fonts-ttf/gw-fonts-ttf_1.0.orig.tar.gz)
-md5sums=('298c1e66a86ab25f013cfb68f7d9e0ba')
+source=(http://ftp.debian.org/debian/pool/main/g/gw-fonts-ttf/gw-fonts-ttf_1.0.orig.tar.bz2)
+md5sums=('e81446f5c03ed00fb280072eb75252e6')
+
+prepare() {
+	cd gw-fonts-ttf-$pkgver
+
+	gunzip Caliban.ttf.gz
+	unzip CasUni.zip
+	unzip CupUniTTF.zip
+}
 
 package() {
 	cd gw-fonts-ttf-$pkgver
-	install -dm755 ${pkgdir}/usr/share/fonts/TTF
 
-	gunzip -f Caliban.ttf.gz
-	unzip -o CasUni.zip
-	unzip -o CupUniTTF.zip
-  
-	install -m644 Caliban.ttf $pkgdir/usr/share/fonts/TTF/Caliban.ttf
-	install -m644 CUPOU___.TTF $pkgdir/usr/share/fonts/TTF/CupolaRegular.ttf
-	install -m644 CUPOULI_.TTF $pkgdir/usr/share/fonts/TTF/CupolaItalic.ttf
-	install -m644 CaslonRoman.ttf $pkgdir/usr/share/fonts/TTF/CaslonRoman.ttf
-	install -m644 CaslonItalic.ttf $pkgdir/usr/share/fonts/TTF/CaslonItalic.ttf
-	install -m644 CaslonBold.ttf $pkgdir/usr/share/fonts/TTF/CaslonBold.ttf
+	install -dm755 "$pkgdir"/usr/share/fonts/TTF
+
+	install -m644 Caliban.ttf "$pkgdir"/usr/share/fonts/TTF/Caliban.ttf
+	install -m644 CUPOU___.TTF "$pkgdir"/usr/share/fonts/TTF/CupolaRegular.ttf
+	install -m644 CUPOULI_.TTF "$pkgdir"/usr/share/fonts/TTF/CupolaItalic.ttf
+	install -m644 CaslonRoman.ttf "$pkgdir"/usr/share/fonts/TTF/CaslonRoman.ttf
+	install -m644 CaslonItalic.ttf "$pkgdir"/usr/share/fonts/TTF/CaslonItalic.ttf
+	install -m644 CaslonBold.ttf "$pkgdir"/usr/share/fonts/TTF/CaslonBold.ttf
+
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/ttf-georgewilliams/COPYING
 }