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

f38
Parag Nemade 13 years ago
parent b9519e9803
commit 8cdbdf7a90

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<!-- Microsoft -->
<alias binding="same">
<family>Arial</family>
<accept>
<family>Arimo</family>
</accept>
</alias>
<alias binding="same">
<family>Arimo</family>
<default>
<family>Arial</family>
</default>
</alias>
</fontconfig>

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<!-- Microsoft -->
<alias binding="same">
<family>Courier New</family>
<accept>
<family>Cousine</family>
</accept>
</alias>
<alias binding="same">
<family>Cousine</family>
<default>
<family>Courier New</family>
</default>
</alias>
</fontconfig>

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<!-- Microsoft -->
<alias binding="same">
<family>Times New Roman</family>
<accept>
<family>Tinos</family>
</accept>
</alias>
<alias binding="same">
<family>Tinos</family>
<default>
<family>Times New Roman</family>
</default>
</alias>
</fontconfig>

@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig> <fontconfig>
<alias> <alias>
<family>sans-serif</family> <family>sans-serif</family>
<prefer> <prefer>
<family>Arimo</family> <family>Arimo</family>
</prefer> </prefer>
</alias> </alias>
<alias> <alias>
<family>Arimo</family> <family>Arimo</family>
<default> <default>
<family>sans-serif</family> <family>sans-serif</family>
</default> </default>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Liberation Sans</family> <family>Liberation Sans</family>
<accept> <accept>
<family>Arimo</family> <family>Arimo</family>
</accept> </accept>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Arimo</family>
<accept>
<family>Liberation Sans</family>
</accept>
</alias>
<!-- Microsoft -->
<alias binding="same">
<family>Arimo</family> <family>Arimo</family>
<default> <accept>
<family>Arial</family> <family>Liberation Sans</family>
</default> </accept>
</alias> </alias>
<alias binding="same">
<family>Arial</family>
<default>
<family>Arimo</family>
</default>
</alias>
</fontconfig> </fontconfig>

@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig> <fontconfig>
<alias> <alias>
<family>sans-serif</family> <family>monospace</family>
<prefer> <prefer>
<family>Cousine</family> <family>Cousine</family>
</prefer> </prefer>
</alias> </alias>
<alias> <alias>
<family>Cousine</family> <family>Cousine</family>
<default> <default>
<family>sans-serif</family> <family>monospace</family>
</default> </default>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Liberation Sans</family> <family>Liberation Mono</family>
<accept> <accept>
<family>Cousine</family> <family>Cousine</family>
</accept> </accept>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Cousine</family> <family>Cousine</family>
<accept> <accept>
<family>Liberation Sans</family> <family>Liberation Mono</family>
</accept> </accept>
</alias> </alias>
<!-- Microsoft -->
<alias binding="same">
<family>Cousine</family>
<default>
<family>Arial</family>
</default>
</alias>
<alias binding="same">
<family>Arial</family>
<default>
<family>Cousine</family>
</default>
</alias>
</fontconfig> </fontconfig>

@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig> <fontconfig>
<alias> <alias>
<family>serif</family> <family>serif</family>
<prefer> <prefer>
<family>Tinos</family> <family>Tinos</family>
</prefer> </prefer>
</alias> </alias>
<alias> <alias>
<family>Tinos</family> <family>Tinos</family>
<default> <default>
<family>serif</family> <family>serif</family>
</default> </default>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Liberation Serif</family> <family>Liberation Serif</family>
<accept> <accept>
<family>Tinos</family> <family>Tinos</family>
</accept> </accept>
</alias> </alias>
<alias binding="same"> <alias binding="same">
<family>Tinos</family>
<accept>
<family>Liberation Serif</family>
</accept>
</alias>
<!-- Microsoft -->
<alias binding="same">
<family>Tinos</family> <family>Tinos</family>
<default> <accept>
<family>Times New Roman</family> <family>Liberation Serif</family>
</default> </accept>
</alias>
<alias binding="same">
<family>Times New Roman</family>
<default>
<family>Tinos</family>
</default>
</alias> </alias>
</fontconfig> </fontconfig>

@ -1,5 +1,6 @@
%global fontname google-croscore %global fontname google-croscore
%global fontconf 62-%{fontname} %global fontconf62 62-%{fontname}
%global fontconf30 30-0-%{fontname}
%global common_desc \ %global common_desc \
This package contains a collections of fonts that offers improved on-screen \ This package contains a collections of fonts that offers improved on-screen \
@ -10,17 +11,20 @@ portability across platforms.
Name: %{fontname}-fonts Name: %{fontname}-fonts
Version: 1.21.0 Version: 1.21.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: The width-compatible fonts for improved on-screen readability Summary: The width-compatible fonts for improved on-screen readability
Group: User Interface/X Group: User Interface/X
License: OFL License: OFL
#URL: #URL:
Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.gz Source0: http://gsdview.appspot.com/chromeos-localmirror/distfiles/croscorefonts-%{version}.tar.gz
Source1: %{fontconf}-arimo-fontconfig.conf Source1: 62-%{fontname}-arimo-fontconfig.conf
Source2: %{fontconf}-cousine-fontconfig.conf Source2: 62-%{fontname}-cousine-fontconfig.conf
Source3: %{fontconf}-tinos-fontconfig.conf Source3: 62-%{fontname}-tinos-fontconfig.conf
Source4: %{fontconf}-symbolneu-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 BuildArch: noarch
BuildRequires: fontpackages-devel 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 and solves the needs of developers looking for width-compatible fonts to
address document portability across platforms. 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 %package -n %{fontname}-cousine-fonts
Summary: The croscore Cousine family 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 and solves the needs of developers looking for width-compatible fonts to
address document portability across platforms. 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 %package -n %{fontname}-tinos-fonts
Summary: The croscore Tinos family 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 and solves the needs of developers looking for width-compatible fonts to
address document portability across platforms. 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 %package -n %{fontname}-symbolneu-fonts
Summary: The croscore Symbol Neu family fonts Summary: The croscore Symbol Neu family fonts
@ -88,7 +91,7 @@ Requires: %{name}-common = %{version}-%{release}
%common_desc %common_desc
Symbol Neu is a metrically compatible font to Symbol. 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 %prep
%setup -q -n croscorefonts-%{version} %setup -q -n croscorefonts-%{version}
@ -105,18 +108,24 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
# Repeat for every font family # Repeat for every font family
install -m 0644 -p %{SOURCE1} \ install -m 0644 -p %{SOURCE1} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-arimo.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-arimo.conf
install -m 0644 -p %{SOURCE2} \ install -m 0644 -p %{SOURCE2} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-cousine.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-cousine.conf
install -m 0644 -p %{SOURCE3} \ install -m 0644 -p %{SOURCE3} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-tinos.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf62}-tinos.conf
install -m 0644 -p %{SOURCE4} \ install -m 0644 -p %{SOURCE4} \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-symbolneu.conf %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-arimo.conf
install -m 0644 -p %{SOURCE5} \
for fconf in %{fontconf}-arimo.conf \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-cousine.conf
%{fontconf}-cousine.conf \ install -m 0644 -p %{SOURCE6} \
%{fontconf}-tinos.conf \ %{buildroot}%{_fontconfig_templatedir}/%{fontconf30}-tinos.conf
%{fontconf}-symbolneu.conf; do 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 \ ln -s %{_fontconfig_templatedir}/$fconf \
%{buildroot}%{_fontconfig_confdir}/$fconf %{buildroot}%{_fontconfig_confdir}/$fconf
done done
@ -127,6 +136,9 @@ done
%changelog %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 * Tue Mar 27 2012 Parag Nemade <pnemade AT redhat DOT com>- 1.21.0-2
- Updated fontconfig rules. - Updated fontconfig rules.

Loading…
Cancel
Save