[Fedora-i18n-bugs] [smc-fonts] Resolved bug 803234

[Pravin Satpute]

commit 558f83c88c3e269041d7f24795d86eef830937ee
Author: प्रविण सातपुते <psatpute at redhat.com>
Date:   Fri Apr 13 14:41:23 2012 +0530

    Resolved bug 803234

 65-0-smc-meera.conf                          |    4 +-
 67-smc-rachana.conf => 65-0-smc-rachana.conf |    8 +-
 bug-545683.patch                             |   33 -
 bug-781938.patch                             |11511 --------------------------
 bug-803234.patch                             |   36 +
 smc-fonts.spec                               |   17 +-
 6 files changed, 54 insertions(+), 11555 deletions(-)
---
diff --git a/65-0-smc-meera.conf b/65-0-smc-meera.conf
index cb6250f..e91e866 100644
--- a/65-0-smc-meera.conf
+++ b/65-0-smc-meera.conf
@@ -2,8 +2,8 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <match>
-  <test name="lang">
-    <string>ml-in</string>
+  <test name="lang" compare="contains">
+    <string>ml</string>
   </test>
   <test name="family">
     <string>sans-serif</string>
diff --git a/67-smc-rachana.conf b/65-0-smc-rachana.conf
similarity index 72%
rename from 67-smc-rachana.conf
rename to 65-0-smc-rachana.conf
index 09fada0..9cd98fa 100644
--- a/67-smc-rachana.conf
+++ b/65-0-smc-rachana.conf
@@ -2,11 +2,11 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <match>
-  <test name="lang">
-    <string>ml-in</string>
+  <test name="lang" compare="contains">
+    <string>ml</string>
   </test>
   <test name="family">
-    <string>sans-serif</string>
+    <string>serif</string>
   </test>
   <edit name="family" mode="prepend">
     <string>Rachana</string>
@@ -15,7 +15,7 @@
 <alias>
   <family>Rachana</family>
   <default>
-    <family>sans-serif</family>
+    <family>serif</family>
   </default>
 </alias>	
 </fontconfig>
diff --git a/bug-803234.patch b/bug-803234.patch
new file mode 100644
index 0000000..6129c15
--- /dev/null
+++ b/bug-803234.patch
@@ -0,0 +1,36 @@
+diff -rup malayalam-fonts-5.0.1/Kalyani/Kalyani.sfd malayalam-fonts-5.0.1_mod/Kalyani/Kalyani.sfd
+--- malayalam-fonts-5.0.1/Kalyani/Kalyani.sfd	2012-03-10 12:22:09.000000000 +0530
++++ malayalam-fonts-5.0.1_mod/Kalyani/Kalyani.sfd	2012-04-13 14:03:26.055482171 +0530
+@@ -26,7 +26,7 @@ TTFWeight: 400
+ TTFWidth: 5
+ LineGap: 0
+ VLineGap: 0
+-Panose: 0 0 4 0 0 0 0 0 0 0
++Panose: 2 11 4 0 0 0 0 0 0 0
+ OS2TypoAscent: -58
+ OS2TypoAOffset: 1
+ OS2TypoDescent: -269
+diff -rup malayalam-fonts-5.0.1/Meera/Meera.sfd malayalam-fonts-5.0.1_mod/Meera/Meera.sfd
+--- malayalam-fonts-5.0.1/Meera/Meera.sfd	2012-03-10 17:48:30.000000000 +0530
++++ malayalam-fonts-5.0.1_mod/Meera/Meera.sfd	2012-04-13 13:45:51.912230709 +0530
+@@ -26,7 +26,7 @@ TTFWeight: 400
+ TTFWidth: 5
+ LineGap: 0
+ VLineGap: 0
+-Panose: 2 0 6 3 0 0 0 0 0 0
++Panose: 2 11 6 3 0 0 0 0 0 0
+ OS2TypoAscent: 0
+ OS2TypoAOffset: 1
+ OS2TypoDescent: 0
+diff -rup malayalam-fonts-5.0.1/RaghuMalayalamSans/RaghuMalayalamSans.sfd malayalam-fonts-5.0.1_mod/RaghuMalayalamSans/RaghuMalayalamSans.sfd
+--- malayalam-fonts-5.0.1/RaghuMalayalamSans/RaghuMalayalamSans.sfd	2012-03-10 12:15:24.000000000 +0530
++++ malayalam-fonts-5.0.1_mod/RaghuMalayalamSans/RaghuMalayalamSans.sfd	2012-04-13 14:03:12.689430273 +0530
+@@ -25,7 +25,7 @@ TTFWeight: 400
+ TTFWidth: 5
+ LineGap: 0
+ VLineGap: 0
+-Panose: 0 0 4 0 0 0 0 0 0 0
++Panose: 2 11 4 0 0 0 0 0 0 0
+ OS2TypoAscent: -118
+ OS2TypoAOffset: 1
+ OS2TypoDescent: -550
diff --git a/smc-fonts.spec b/smc-fonts.spec
index 0e6606c..e927d8d 100644
--- a/smc-fonts.spec
+++ b/smc-fonts.spec
@@ -7,7 +7,7 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	5.0.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2 and GPL+
@@ -17,7 +17,7 @@ Source1: 65-0-smc-meera.conf
 Source2: 67-smc-anjalioldlipi.conf
 Source3: 67-smc-dyuthi.conf
 Source4: 67-smc-kalyani.conf
-Source5: 67-smc-rachana.conf
+Source5: 65-0-smc-rachana.conf
 Source6: 67-smc-raghumalayalam.conf
 Source7: 67-smc-suruma.conf
 Source8: AnjaliOldLipi-license-confirmation-email.txt
@@ -25,6 +25,7 @@ BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRequires:	fontforge >= 20080429
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: bug-803234.patch
 
 %description
 %common_desc
@@ -76,7 +77,7 @@ Obsoletes: %{name}-rachana < 5.0
 The Rachana font package contains fonts for the display of
 traditional Malayalam Scripts.
 
-%_font_pkg -n rachana -f 67-smc-rachana.conf Rachana.ttf
+%_font_pkg -n rachana -f 65-0-smc-rachana.conf Rachana.ttf
 %doc Rachana/COPYING Rachana/LICENSE Rachana/README
 
 
@@ -136,6 +137,7 @@ traditional Malayalam Scripts.
 
 %prep
 %setup -q -n malayalam-fonts-%{version}
+%patch1 -p1 -b .1-panose-setting
 
 %build
 chmod +x generate.pe
@@ -162,7 +164,7 @@ install -m 0644 -p %{SOURCE3} \
 install -m 0644 -p %{SOURCE4} \
 	%{buildroot}%{_fontconfig_templatedir}/67-smc-kalyani.conf
 install -m 0644 -p %{SOURCE5} \
-	%{buildroot}%{_fontconfig_templatedir}/67-smc-rachana.conf
+	%{buildroot}%{_fontconfig_templatedir}/65-0-smc-rachana.conf
 install -m 0644 -p %{SOURCE6} \
 	%{buildroot}%{_fontconfig_templatedir}/67-smc-raghumalayalam.conf
 install -m 0644 -p %{SOURCE7} \
@@ -172,7 +174,7 @@ for fconf in 65-0-smc-meera.conf \
 	     67-smc-anjalioldlipi.conf \
 	     67-smc-dyuthi.conf \
 	     67-smc-kalyani.conf \
-	     67-smc-rachana.conf \
+	     65-0-smc-rachana.conf \
 	     67-smc-raghumalayalam.conf \
 	     67-smc-suruma.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
@@ -189,6 +191,11 @@ rm -fr %{buildroot}
 %doc ChangeLog 
 
 %changelog
+* Fri Apr 13 2012 Pravin Satpute <psatpute at redhat.com> 5.0.1-2
+- Resolved bug 803234
+- Updated panose for Meera, RaghuMalayalam and Kalyani
+- Changed conf file of Rachana from Sans to Serir
+
 * Sat Mar 17 2012 Rajeesh K Nambiar <rajeeshknambiar at gmail.com> 5.0.1-1
 - New upstream release 5.0.1 introducing Unicode 5.1 compatibility
 - Resolves Meera size issues