[google-croscore-fonts/f17] Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf

[pnemade]

commit 208e0f748ff7edc985561b04ca266732f5b4a380
Author: Parag Nemade <pnemade at redhat.com>
Date:   Tue Apr 24 19:57:30 2012 +0530

    Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf

 30-0-google-croscore-symbolneu-fontconfig.conf |   17 --------
 google-croscore-fonts.spec                     |   52 ++++++++++++++---------
 2 files changed, 32 insertions(+), 37 deletions(-)
---
diff --git a/google-croscore-fonts.spec b/google-croscore-fonts.spec
index a170b74..7986250 100644
--- a/google-croscore-fonts.spec
+++ b/google-croscore-fonts.spec
@@ -1,5 +1,6 @@
 %global fontname google-croscore
-%global fontconf 62-%{fontname}
+%global fontconf62 62-%{fontname}
+%global fontconf30 30-0-%{fontname}
 
 %global common_desc \
 This package contains a collections of fonts that offers improved on-screen \
@@ -10,17 +11,20 @@ portability across platforms.
 
 Name:           %{fontname}-fonts
 Version:        1.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The width-compatible fonts for improved on-screen readability
 
 Group:          User Interface/X
 License:        OFL
 #URL:            
 Source0:        http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.gz
-Source1:        %{fontconf}-arimo-fontconfig.conf
-Source2:        %{fontconf}-cousine-fontconfig.conf
-Source3:        %{fontconf}-tinos-fontconfig.conf
-Source4:        %{fontconf}-symbolneu-fontconfig.conf
+Source1:        62-%{fontname}-arimo-fontconfig.conf
+Source2:        62-%{fontname}-cousine-fontconfig.conf
+Source3:        62-%{fontname}-tinos-fontconfig.conf
+Source4:        30-0-%{fontname}-arimo-fontconfig.conf
+Source5:        30-0-%{fontname}-cousine-fontconfig.conf
+Source6:        30-0-%{fontname}-tinos-fontconfig.conf
+Source7:        62-%{fontname}-symbolneu-fontconfig.conf
 
 BuildArch:      noarch
 BuildRequires:  fontpackages-devel
@@ -49,8 +53,7 @@ on-screen readability characteristics and the pan-European WGL character set
 and solves the needs of developers looking for width-compatible fonts to 
 address document portability across platforms.
 
-%_font_pkg -n arimo -f %{fontconf}-arimo.conf Arimo*.ttf
-
+%_font_pkg -n arimo -f *-%{fontname}-arimo.conf Arimo*.ttf
 
 %package -n %{fontname}-cousine-fonts
 Summary:       The croscore Cousine family fonts
@@ -64,7 +67,7 @@ on-screen readability characteristics and the pan-European WGL character set
 and solves the needs of developers looking for width-compatible fonts to 
 address document portability across platforms.
 
-%_font_pkg -n cousine -f %{fontconf}-cousine.conf Cousine*.ttf
+%_font_pkg -n cousine -f *-%{fontname}-cousine.conf  Cousine*.ttf
 
 %package -n %{fontname}-tinos-fonts
 Summary:       The croscore Tinos family fonts
@@ -78,7 +81,7 @@ on-screen readability characteristics and the pan-European WGL character set
 and solves the needs of developers looking for width-compatible fonts to
 address document portability across platforms.
 
-%_font_pkg -n tinos -f %{fontconf}-tinos.conf Tinos*.ttf
+%_font_pkg -n tinos -f *-%{fontname}-tinos.conf Tinos*.ttf
 
 %package -n %{fontname}-symbolneu-fonts
 Summary:       The croscore Symbol Neu family fonts
@@ -88,7 +91,7 @@ Requires:       %{name}-common = %{version}-%{release}
 %common_desc
 Symbol Neu is a metrically compatible font to Symbol.
 
-%_font_pkg -n symbolneu -f %{fontconf}-symbolneu.conf SymbolNeu.ttf
+%_font_pkg -n symbolneu -f *-%{fontname}-symbolneu.conf SymbolNeu.ttf
 
 %prep
 %setup -q -n croscorefonts-%{version}
@@ -105,18 +108,24 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 
 # Repeat for every font family
 install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-arimo.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-arimo.conf
 install -m 0644 -p %{SOURCE2} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-cousine.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-cousine.conf
 install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tinos.conf
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-tinos.conf
 install -m 0644 -p %{SOURCE4} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-symbolneu.conf
-
-for fconf in %{fontconf}-arimo.conf \
-             %{fontconf}-cousine.conf \
-             %{fontconf}-tinos.conf \
-       %{fontconf}-symbolneu.conf; do
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-arimo.conf
+install -m 0644 -p %{SOURCE5} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-cousine.conf
+install -m 0644 -p %{SOURCE6} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-tinos.conf
+install -m 0644 -p %{SOURCE7} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-symbolneu.conf
+
+for fconf in %{fontconf62}-arimo.conf %{fontconf30}-arimo.conf \
+             %{fontconf62}-cousine.conf %{fontconf30}-cousine.conf \
+             %{fontconf62}-tinos.conf %{fontconf30}-tinos.conf \
+       %{fontconf62}-symbolneu.conf; do
   ln -s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
@@ -127,6 +136,9 @@ done
 
 
 %changelog
+* Tue Apr 24 2012 Parag Nemade <pnemade AT redhat DOT com>- 1.21.0-3
+- Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf
+
 * Tue Mar 27 2012 Parag Nemade <pnemade AT redhat DOT com>- 1.21.0-2
 - Updated fontconfig rules.