[paktype-naskh-basic-fonts/f20] Resolves bz:1062128 : Making default font for Urdu language

[Pravin Satpute]

commit 254500c1bd5a9f1a97775e5f1b6913e0efb40ecc
Author: pravins <psatpute(a)redhat.com&gt;
Date:   Thu Feb 6 16:07:20 2014 +0530

    Resolves bz:1062128 : Making default font for Urdu language

 ...kh-basic.conf => paktype-naskh-basic-fonts.conf |   22 ++++---------------
 paktype-naskh-basic-fonts.spec                     |   12 +++++++---
 2 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/67-paktype-naskh-basic.conf b/paktype-naskh-basic-fonts.conf
similarity index 56%
rename from 67-paktype-naskh-basic.conf
rename to paktype-naskh-basic-fonts.conf
index 1e7b48d..f9675b1 100644
--- a/67-paktype-naskh-basic.conf
+++ b/paktype-naskh-basic-fonts.conf
@@ -9,36 +9,24 @@
     <string>sans-serif</string>
   </test>
   <edit name="family" mode="prepend">
-    <string>PakType Nashk Basic</string>
+    <string>PakType Naskh Basic</string>
   </edit>
 </match>
 
 <match>
-  <test name="lang">
-    <string>ur-pk</string>
-  </test>
-  <test name="family">
-    <string>sans-serif</string>
-  </test>
-  <edit name="family" mode="prepend">
-    <string>PakType Nashk Basic</string>
-  </edit>
-</match>
-
-<match>
-  <test name="lang">
-    <string>ur-in</string>
+  <test name="lang" compare="contains">
+    <string>ur</string>
   </test>
   <test name="family">
     <string>sans-serif</string>
   </test>
   <edit name="family" mode="prepend">
-    <string>PakType Nashk Basic</string>
+    <string>PakType Naskh Basic</string>
   </edit>
 </match>
 
 <alias>
-  <family>PakType Nashk Basic</family>
+  <family>PakType Naskh Basic</family>
   <default>
     <family>sans-serif</family>
   </default>
diff --git a/paktype-naskh-basic-fonts.spec b/paktype-naskh-basic-fonts.spec
index 686f608..9aef4c8 100644
--- a/paktype-naskh-basic-fonts.spec
+++ b/paktype-naskh-basic-fonts.spec
@@ -1,15 +1,16 @@
+%global priority 65-0
 %global fontname paktype-naskh-basic
-%global fontconf 67-paktype-naskh-basic
+%global fontconf %{priority}-%{fontname}
 
 Name:	%{fontname}-fonts
 Version:     4.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 Summary:     Fonts for Arabic, Farsi, Urdu and Sindhi from PakType
 Group:		User Interface/X
 License:     GPLv2 with exceptions
 URL:		https://sourceforge.net/projects/paktype/
 Source0:    
http://downloads.sourceforge.net/paktype/Individual-Release/PakType-Naskh...
-Source1:	%{fontconf}.conf
+Source1:	%{name}.conf
 BuildArch:   noarch
 BuildRequires:	fontpackages-devel
 Requires:   fontpackages-filesystem
@@ -52,6 +53,9 @@ ln -s %{_fontconfig_templatedir}/%{fontconf}.conf \
 %doc PakType_Naskh_Basic_License.txt PakTypeNaskhBasicFeatures.pdf
 
 %changelog
+* Thu Feb 06 2014 Pravin Satpute <psatpute(a)redhat.com&gt; - 4.1-3
+- Resolves bz:1062128 : Making default font for Urdu language
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -90,7 +94,7 @@ ln -s %{_fontconfig_templatedir}/%{fontconf}.conf \
 * Fri Mar 12 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-5
 - changed the name of package from paktype-nashk-basic to paktype-naskh-basic
 
-* Fri Mar 9 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-4
+* Tue Mar 9 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-4
 - removed redundant  BuildRequires from specfile
 - removed unnecessary rm/rmdir's from specfile
 - Sane updates in docs.