rpms/paktype-naskh-basic-fonts/devel 67-paktype-naskh-basic-sa.conf, 1.1, 1.2 67-paktype-naskh-basic.conf, 1.1, 1.2 paktype-naskh-basic-fonts.spec, 1.2, 1.3

[Naveen Kumar]

Author: nkumar

Update of /cvs/pkgs/rpms/paktype-naskh-basic-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1906

Modified Files:
	67-paktype-naskh-basic-sa.conf 67-paktype-naskh-basic.conf 
	paktype-naskh-basic-fonts.spec 
Log Message:
* Mon Jun 21 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-8
- add ur-in, ur-pk & pa-pk locale-specific overrides rule in
67-paktype-naskh-basic.conf
- add ur-in, ur-pk & pa-pk locale-specific overrides rule in
67-paktype-naskh-basic-sa.conf
- resolves bug #586789




Index: 67-paktype-naskh-basic-sa.conf
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naskh-basic-fonts/devel/67-paktype-naskh-basic-sa.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 67-paktype-naskh-basic-sa.conf	17 Mar 2010 06:51:58 -0000	1.1
+++ 67-paktype-naskh-basic-sa.conf	21 Jun 2010 09:24:16 -0000	1.2
@@ -1,16 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
+<match>
+  <test name="lang">
+    <string>pa-pk</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Naskh Basic SA</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 Naskh Basic SA</string>
+  </edit>
+</match>
+
+<match>
+  <test name="lang">
+    <string>ur-in</string>
+  </test>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Naskh Basic SA</string>
+  </edit>
+</match>
+
+<alias>
+  <family>PakType Naskh Basic SA</family>
+  <default>
     <family>sans-serif</family>
-    <prefer>
-      <family>PakType Naskh Basic SA</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>PakType Naskh Basic SA</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>                       
+  </default>
+</alias>
+</fontconfig>
+


Index: 67-paktype-naskh-basic.conf
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naskh-basic-fonts/devel/67-paktype-naskh-basic.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 67-paktype-naskh-basic.conf	17 Mar 2010 06:51:58 -0000	1.1
+++ 67-paktype-naskh-basic.conf	21 Jun 2010 09:24:16 -0000	1.2
@@ -1,16 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
+<match>
+  <test name="lang">
+    <string>pa-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-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>
+  <test name="family">
+    <string>sans-serif</string>
+  </test>
+  <edit name="family" mode="prepend">
+    <string>PakType Nashk Basic</string>
+  </edit>
+</match>
+
+<alias>
+  <family>PakType Nashk Basic</family>
+  <default>
     <family>sans-serif</family>
-    <prefer>
-      <family>PakType Naskh Basic</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>PakType Naskh Basic</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
-</fontconfig>                       
+  </default>
+</alias>
+</fontconfig>
+


Index: paktype-naskh-basic-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/paktype-naskh-basic-fonts/devel/paktype-naskh-basic-fonts.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- paktype-naskh-basic-fonts.spec	6 May 2010 05:19:16 -0000	1.2
+++ paktype-naskh-basic-fonts.spec	21 Jun 2010 09:24:16 -0000	1.3
@@ -9,7 +9,7 @@ Arabic, Farsi, Urdu and Sindhi from PakT
 
 Name:    %{fontname}-fonts
 Version: 3.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2 with exceptions
 URL: https://sourceforge.net/projects/paktype/
 Source0: http://downloads.sourceforge.net/project/paktype/NaskhBasic-3.0.tar.gz
@@ -155,6 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc PakType_Naskh_Basic_Comparison_Chart.htm PakType_Naskh_Basic_License.txt
PakType_Naskh_Basic_Comparison_Chart.pdf Readme.txt
 
 %changelog
+* Mon Jun 21 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-8
+- add ur-in, ur-pk & pa-pk locale-specific overrides rule in
67-paktype-naskh-basic.conf
+- add ur-in, ur-pk & pa-pk locale-specific overrides rule in
67-paktype-naskh-basic-sa.conf
+- resolves bug #586789
+
 * Thu May 6 2010 Naveen Kumar <nkumar(a)redhat.com&gt; - 3.0-7
 - remove binding="same" from all *.conf files