rpms/smc-fonts/devel 66-smc-meera.conf, NONE, 1.1 bug-545683.patch, NONE, 1.1 smc-fonts.spec, 1.10, 1.11

[Pravin Satpute]

Author: pravins

Update of /cvs/pkgs/rpms/smc-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13694

Modified Files:
	smc-fonts.spec 
Added Files:
	66-smc-meera.conf bug-545683.patch 
Log Message:
 Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> 04.2-3
- bugfix 545683



--- NEW FILE 66-smc-meera.conf ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match>
  <test name="lang" compare="contains">
    <string>ml</string>
  </test>
  <test name="family">
    <string>sans-serif</string>
  </test>
  <edit name="family" mode="prepend_first" binding="same">
    <string>Meera</string>
  </edit>
</match>
<alias>
  <family>Meera</family>
  <default>
    <family>sans-serif</family>
  </default>
</alias>
</fontconfig>


bug-545683.patch:
 malayalam-fonts.conf |   12 ------------
 1 file changed, 12 deletions(-)

--- NEW FILE bug-545683.patch ---
diff -rup malayalam-fonts-04/malayalam-fonts.conf malayalam-fonts-04_mod/malayalam-fonts.conf
--- malayalam-fonts-04/malayalam-fonts.conf	2008-06-30 00:46:25.000000000 +0530
+++ malayalam-fonts-04_mod/malayalam-fonts.conf	2009-12-09 10:45:20.000000000 +0530
@@ -7,18 +7,6 @@
                 <string>ml</string>
         </test>
         <alias>
-                <family>sans-serif</family>
-                <prefer>
-                        <family>Meera</family> 
-                </prefer>
-	</alias>
-</match>
-
-<match target="font">
-        <test name="lang" compare="contains">
-                <string>ml</string>
-        </test>
-        <alias>
                 <family>serif</family>
                 <prefer>
                         <family>Rachana</family>


Index: smc-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/smc-fonts/devel/smc-fonts.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- smc-fonts.spec	14 Oct 2009 05:43:10 -0000	1.10
+++ smc-fonts.spec	9 Dec 2009 06:30:09 -0000	1.11
@@ -8,16 +8,18 @@ traditional and new Malayalam Script.
 
 Name:		%{fontname}-fonts
 Version:	04.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Open Type Fonts for Malayalam script
 Group:		User Interface/X
 License:	GPLv3+ with exceptions and GPLv2+ with exceptions and GPLv2+ and  GPLv2
 URL:		http://savannah.nongnu.org/projects/smc
 Source:		http://download.savannah.nongnu.org/releases/smc/fonts/malayalam-fonts-%{version}.zip
+Source1: 66-smc-meera.conf
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel > 1.13
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: bug-523454.patch
+Patch2: bug-545683.patch
 
 %description
 %common_desc
@@ -54,7 +56,7 @@ Obsoletes: %{name}-meera < 04.2-1
 The Meera font package contains fonts for the display of
 traditional Malayalam Scripts.
 
-%_font_pkg -n meera -f 90-%{fontname}-fonts.conf Meera*.ttf 
+%_font_pkg -n meera -f *smc*.conf Meera*.ttf 
 
 
 %package -n %{fontname}-rachana-fonts
@@ -128,6 +130,7 @@ traditional Malayalam Scripts.
 %prep
 %setup -q -n malayalam-fonts-04
 %patch1 -p1 -b .1-conffile
+%patch2 -p1 -b .2-fontconf_priority
 
 %build
 echo "Nothing to do in Build."
@@ -139,11 +142,17 @@ install -m 0644 -p *.ttf  %{buildroot}%{
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
 install -m 0644 -p $RPM_BUILD_DIR/malayalam-fonts-04/malayalam-fonts.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-fonts.conf
-for fconf in %{fontconf}-fonts.conf ; do
+
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/66-smc-meera.conf
+
+for fconf in %{fontconf}-fonts.conf \
+             66-smc-meera.conf ; do
   ln -s %{_fontconfig_templatedir}/$fconf \
-	%{buildroot}%{_fontconfig_confdir}/$fconf
+        %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
+
 %clean
 rm -fr %{buildroot}
 
@@ -154,6 +163,9 @@ rm -fr %{buildroot}
 %dir %{_fontdir}
 
 %changelog
+* Wed Dec 09 2009 Pravin Satpute <psatpute at redhat.com> 04.2-3
+- bugfix 545683
+
 * Wed Oct 14 2009 Pravin Satpute <psatpute at redhat.com> 04.2-2
 - bugfix 523454