misc improvements

3 files changed, 62 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82a61e6724b8..99f8ab4dd9f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = ttf-ubuntu-arabic
 	pkgdesc = Public release of Arabic font to Ubuntu Xenial Xerus
 	pkgver = 0.84+arabic
-	pkgrel = 2
+	pkgrel = 3
 	url = https://launchpad.net/ubuntu/+source/ubuntu-font-family-sources/0.84~mono0.83+arabicfontconfig-0ubuntu1
 	arch = any
 	license = custom:Ubuntu Font Licence 1.0
 	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-font-family-sources_0.84~mono0.83+arabicfontconfig.orig-arabicbeta.tar.gz
 	source = LICENCE.txt
 	source = 65-ubuntu-arabic.conf
-	md5sums = 561ba71ea16185e0fc389890c2631724
-	md5sums = 325a1a9029112a2405e743c7f816427b
-	md5sums = e8d413b3e001764007e9fc26d4dcf7dd
+	sha256sums = 1689b229420dcef4aee0a3a2e9bfaa7a5ef20b2f7c28d8f96f018f926bed2675
+	sha256sums = 2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002
+	sha256sums = 1518e32cd57c92370a3044c53974e1ce03cd9bd75451a477152bd03acbfbc5a9
 
 pkgname = ttf-ubuntu-arabic
 
diff --git a/65-ubuntu-arabic.conf b/65-ubuntu-arabic.conf
index 213c6b1bfec6..acfa938d2182 100644
--- a/65-ubuntu-arabic.conf
+++ b/65-ubuntu-arabic.conf
@@ -1,54 +1,48 @@
 <?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
 <fontconfig>
-
-  <!-- Append Ubuntu Arabic at end of font lists -->
-  <match target="pattern">
-    <test name="family"><string>serif</string></test>
-    <edit name="family" mode="append"><string>Ubuntu Arabic</string></edit>
-  </match>
-  <match target="pattern">
-    <test name="family"><string>sans-serif</string></test>
-    <edit name="family" mode="append"><string>Ubuntu Arabic</string></edit>
-  </match>
-  <match target="pattern">
-    <test name="family"><string>monospace</string></test>
-    <edit name="family" mode="append"><string>Ubuntu Arabic</string></edit>
-  </match>
-
-  <!-- Preferred fonts for Arabic -->
-  <match target="pattern">
-    <test name="lang" compare="contains">
-      <string>ar</string>
-    </test>
-    <test name="family">
-      <string>serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>Ubuntu Arabic</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test name="lang" compare="contains">
-      <string>ar</string>
-    </test>
-    <test name="family">
-      <string>sans-serif</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>Ubuntu Arabic</string>
-    </edit>
-  </match>
-  <match target="pattern">
-    <test name="lang" compare="contains">
-      <string>ar</string>
-    </test>
-    <test name="family">
-      <string>monospace</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>Ubuntu Arabic</string>
-    </edit>
-  </match>
-  
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ar</string>
+		</test>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Ubuntu Arabic</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ar</string>
+		</test>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Ubuntu Arabic</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ar</string>
+		</test>
+		<test name="family">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Ubuntu Arabic</string>
+		</edit>
+	</match>
+	<match target="pattern">
+		<test name="lang" compare="contains">
+			<string>ar</string>
+		</test>
+		<test name="family">
+			<string>system-ui</string>
+		</test>
+		<edit name="family" mode="prepend" binding="strong">
+			<string>Ubuntu Arabic</string>
+		</edit>
+	</match>
 </fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index 5a00093d3504..2f7ba1908736 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,24 @@
 
 pkgname=ttf-ubuntu-arabic
 pkgver=0.84+arabic
-pkgrel=2
+pkgrel=3
 pkgdesc="Public release of Arabic font to Ubuntu Xenial Xerus"
 arch=('any')
 url="https://launchpad.net/ubuntu/+source/ubuntu-font-family-sources/0.84~mono0.83+arabicfontconfig-0ubuntu1"
 license=('custom:Ubuntu Font Licence 1.0')
 source=("https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-font-family-sources_0.84~mono0.83+arabicfontconfig.orig-arabicbeta.tar.gz"
-        "LICENCE.txt"
-        "65-ubuntu-arabic.conf")
-md5sums=('561ba71ea16185e0fc389890c2631724'
-         '325a1a9029112a2405e743c7f816427b'
-         'e8d413b3e001764007e9fc26d4dcf7dd')
+        LICENCE.txt
+        65-ubuntu-arabic.conf)
+sha256sums=('1689b229420dcef4aee0a3a2e9bfaa7a5ef20b2f7c28d8f96f018f926bed2675'
+            '2f0015108d68627bd788d313f529c21ff4da2c2c42a5e1f3883acc83480f9002'
+            '1518e32cd57c92370a3044c53974e1ce03cd9bd75451a477152bd03acbfbc5a9')
 
 package() {
-	install -d ${pkgdir}/usr/share/fonts/TTF/ ${pkgdir}/etc/fonts/conf.d
-	install -m644 ${srcdir}/arabicbeta/*.ttf ${pkgdir}/usr/share/fonts/TTF/
-	install -D -m644 ${srcdir}/LICENCE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-	install -D -m644 ${srcdir}/65-ubuntu-arabic.conf ${pkgdir}/etc/fonts/conf.avail/65-ubuntu-arabic.conf
-	ln -s ../conf.avail/65-ubuntu-arabic.conf ${pkgdir}/etc/fonts/conf.d/65-ubuntu-arabic.conf
+  install -Dt "$pkgdir"/usr/share/fonts/TTF -m644 arabicbeta/*.ttf
+  install -Dt "$pkgdir"/usr/share/licenses/$pkgname -m644 LICENCE.txt
+
+  # Install fontconfig files
+  install -Dt "$pkgdir"/etc/fonts/conf.avail -m644 *.conf
+  install -d "$pkgdir"/etc/fonts/conf.d
+  ln -rs "$pkgdir"/etc/fonts/conf.avail/* "$pkgdir"/etc/fonts/conf.d
 }