clean up PKGBUILD and ttf-x2.install

3 files changed, 32 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eee483eb24da..3b2628a48c28 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Apr 18 15:19:21 UTC 2016
 pkgbase = ttf-x2
-	pkgdesc = X Series 2 fonts are built on freely available fonts and extended to support Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish (Ottoman) and modern Turkish (Roman).
+	pkgdesc = Free fonts with support for Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish (Ottoman) and modern Turkish (Roman).
 	pkgver = 1.0
-	pkgrel = 0
+	pkgrel = 1
 	url = http://wiki.irmug.com/index.php?title=X_Series_2
 	install = ttf-x2.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index af4cd811a6d9..21e126397aba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,35 @@
 
 pkgname=ttf-x2
 pkgver=1.0
-pkgrel=0
-pkgdesc="X Series 2 fonts are built on freely available fonts and extended to support Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish (Ottoman) and modern Turkish (Roman)."
+pkgrel=1
+pkgdesc="Free fonts with support for Persian, Arabic, Urdu, Pashto, Dari, Uzbek, Kurdish, Uighur, old Turkish (Ottoman) and modern Turkish (Roman)."
 arch=('any')
 url="http://wiki.irmug.com/index.php?title=X_Series_2"
 license=('custom:OFL')
 groups=(persian-fonts)
 depends=('fontconfig' 'xorg-font-utils' 'unzip')
 source=("zar.zip::http://dl.irmug.com/dl.php?id=21"
- 	"niloofar.zip::http://dl.irmug.com/dl.php?id=3" 
-	"khoramshahr.zip::http://dl.irmug.com/dl.php?id=2" 
-	"kayhan.zip::http://dl.irmug.com/dl.php?id=1" 
-	"yaghut.zip::http://dl.irmug.com/dl.php?id=17" 
-	"riyaz.zip::http://dl.irmug.com/dl.php?id=5" 
-	"roya.zip::http://dl.irmug.com/dl.php?id=6" 
-	"shafigh.zip::http://dl.irmug.com/dl.php?id=7" 
-	"shafigh-kurd.zip::http://dl.irmug.com/dl.php?id=9" 
-	"shafigh-uzbek.zip::http://dl.irmug.com/dl.php?id=8" 
-	"shiraz.zip::http://dl.irmug.com/dl.php?id=10" 
-	"sols.zip::http://dl.irmug.com/dl.php?id=11" 
-	"tabriz.zip::http://dl.irmug.com/dl.php?id=12" 
-	"titre.zip::http://dl.irmug.com/dl.php?id=13" 
-	"traffic.zip::http://dl.irmug.com/dl.php?id=14" 
-	"paatch.zip::http://dl.irmug.com/dl.php?id=4" 
-	"vahid.zip::http://dl.irmug.com/dl.php?id=15" 
-	"vosta.zip::http://dl.irmug.com/dl.php?id=16" 
-	"yekan.zip::http://dl.irmug.com/dl.php?id=19" 
-	"yermook.zip::http://dl.irmug.com/dl.php?id=20" 
-	"yas.zip::http://dl.irmug.com/dl.php?id=18" 
-	"ziba.zip::http://dl.irmug.com/dl.php?id=22")
+        "niloofar.zip::http://dl.irmug.com/dl.php?id=3" 
+        "khoramshahr.zip::http://dl.irmug.com/dl.php?id=2" 
+        "kayhan.zip::http://dl.irmug.com/dl.php?id=1" 
+        "yaghut.zip::http://dl.irmug.com/dl.php?id=17" 
+        "riyaz.zip::http://dl.irmug.com/dl.php?id=5" 
+        "roya.zip::http://dl.irmug.com/dl.php?id=6" 
+        "shafigh.zip::http://dl.irmug.com/dl.php?id=7" 
+        "shafigh-kurd.zip::http://dl.irmug.com/dl.php?id=9" 
+        "shafigh-uzbek.zip::http://dl.irmug.com/dl.php?id=8" 
+        "shiraz.zip::http://dl.irmug.com/dl.php?id=10" 
+        "sols.zip::http://dl.irmug.com/dl.php?id=11" 
+        "tabriz.zip::http://dl.irmug.com/dl.php?id=12" 
+        "titre.zip::http://dl.irmug.com/dl.php?id=13" 
+        "traffic.zip::http://dl.irmug.com/dl.php?id=14" 
+        "paatch.zip::http://dl.irmug.com/dl.php?id=4" 
+        "vahid.zip::http://dl.irmug.com/dl.php?id=15" 
+        "vosta.zip::http://dl.irmug.com/dl.php?id=16" 
+        "yekan.zip::http://dl.irmug.com/dl.php?id=19" 
+        "yermook.zip::http://dl.irmug.com/dl.php?id=20" 
+        "yas.zip::http://dl.irmug.com/dl.php?id=18" 
+        "ziba.zip::http://dl.irmug.com/dl.php?id=22")
 noextract=("${source[@]%%::*}")
 install=$pkgname.install
 md5sums=('8e08f1d30a07e687d0a858558a852ce1'
@@ -60,9 +60,8 @@ prepare() {
   unzip -o -qq -LL -j '*.zip' -d $srcdir/$pkgname/ 
 }
 
-package() {
-  chmod 644 "$srcdir/$pkgname/"*.*
-  install -dm755 "$pkgdir/usr/share/fonts/TTF"
-  cp -dpr --no-preserve=ownership "$srcdir/$pkgname/"*.ttf "$pkgdir/usr/share/fonts/TTF/"
-  install -D "$srcdir/$pkgname/ofl.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+package() {  
+  install -d $pkgdir/usr/share/fonts/$pkgname
+  install -m 644 -t $pkgdir/usr/share/fonts/$pkgname $srcdir/$pkgname/*.ttf
+  install -Dm 644 $srcdir/$pkgname/ofl.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/ttf-x2.install b/ttf-x2.install
index 1aae7e73bcb5..1d8966f45ac0 100644
--- a/ttf-x2.install
+++ b/ttf-x2.install
@@ -1,9 +1,5 @@
 post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -fs >/dev/null
-  mkfontscale /usr/share/fonts/TTF /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/TTF /usr/share/fonts/Type1
-  echo "done"
+  fc-cache -s
 }
 
 post_upgrade() {