[google-croscore-fonts] Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf
pnemade
pnemade at fedoraproject.org
Tue Apr 24 14:50:04 UTC 2012
- Previous message: [google-croscore-fonts/f17] Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf
- Next message: [Bug 806270] CVE-2012-{1126, 1127, 1128, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144} freetype: multiple vulnerabilities [fedora-all]
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
commit 8cdbdf7a90e539d22967e8a200d19526bb01a52d
Author: Parag Nemade <pnemade at redhat.com>
Date: Tue Apr 24 20:19:58 2012 +0530
Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf
30-0-google-croscore-arimo-fontconfig.conf | 18 +++++++++
30-0-google-croscore-cousine-fontconfig.conf | 18 +++++++++
30-0-google-croscore-tinos-fontconfig.conf | 18 +++++++++
62-google-croscore-arimo-fontconfig.conf | 45 +++++++---------------
62-google-croscore-cousine-fontconfig.conf | 47 ++++++++---------------
62-google-croscore-tinos-fontconfig.conf | 45 +++++++---------------
google-croscore-fonts.spec | 52 ++++++++++++++++----------
7 files changed, 132 insertions(+), 111 deletions(-)
---
diff --git a/30-0-google-croscore-arimo-fontconfig.conf b/30-0-google-croscore-arimo-fontconfig.conf
new file mode 100644
index 0000000..3b5912c
--- /dev/null
+++ b/30-0-google-croscore-arimo-fontconfig.conf
@@ -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>
+
diff --git a/30-0-google-croscore-cousine-fontconfig.conf b/30-0-google-croscore-cousine-fontconfig.conf
new file mode 100644
index 0000000..f5c72ca
--- /dev/null
+++ b/30-0-google-croscore-cousine-fontconfig.conf
@@ -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>
+
diff --git a/30-0-google-croscore-tinos-fontconfig.conf b/30-0-google-croscore-tinos-fontconfig.conf
new file mode 100644
index 0000000..4ea5186
--- /dev/null
+++ b/30-0-google-croscore-tinos-fontconfig.conf
@@ -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>
+
diff --git a/62-google-croscore-arimo-fontconfig.conf b/62-google-croscore-arimo-fontconfig.conf
index a0088f3..5346663 100644
--- a/62-google-croscore-arimo-fontconfig.conf
+++ b/62-google-croscore-arimo-fontconfig.conf
@@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<alias>
- <family>sans-serif</family>
- <prefer>
- <family>Arimo</family>
- </prefer>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Arimo</family>
+ </prefer>
</alias>
<alias>
- <family>Arimo</family>
- <default>
- <family>sans-serif</family>
- </default>
+ <family>Arimo</family>
+ <default>
+ <family>sans-serif</family>
+ </default>
</alias>
<alias binding="same">
- <family>Liberation Sans</family>
- <accept>
- <family>Arimo</family>
- </accept>
+ <family>Liberation Sans</family>
+ <accept>
+ <family>Arimo</family>
+ </accept>
</alias>
<alias binding="same">
- <family>Arimo</family>
- <accept>
- <family>Liberation Sans</family>
- </accept>
- </alias>
-
- <!-- Microsoft -->
- <alias binding="same">
<family>Arimo</family>
- <default>
- <family>Arial</family>
- </default>
+ <accept>
+ <family>Liberation Sans</family>
+ </accept>
</alias>
- <alias binding="same">
- <family>Arial</family>
- <default>
- <family>Arimo</family>
- </default>
- </alias>
-
</fontconfig>
diff --git a/62-google-croscore-cousine-fontconfig.conf b/62-google-croscore-cousine-fontconfig.conf
index fea7747..973421e 100644
--- a/62-google-croscore-cousine-fontconfig.conf
+++ b/62-google-croscore-cousine-fontconfig.conf
@@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<alias>
- <family>sans-serif</family>
- <prefer>
- <family>Cousine</family>
- </prefer>
+ <family>monospace</family>
+ <prefer>
+ <family>Cousine</family>
+ </prefer>
</alias>
<alias>
- <family>Cousine</family>
- <default>
- <family>sans-serif</family>
- </default>
+ <family>Cousine</family>
+ <default>
+ <family>monospace</family>
+ </default>
</alias>
<alias binding="same">
- <family>Liberation Sans</family>
- <accept>
- <family>Cousine</family>
- </accept>
+ <family>Liberation Mono</family>
+ <accept>
+ <family>Cousine</family>
+ </accept>
</alias>
<alias binding="same">
- <family>Cousine</family>
- <accept>
- <family>Liberation Sans</family>
- </accept>
+ <family>Cousine</family>
+ <accept>
+ <family>Liberation Mono</family>
+ </accept>
</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>
diff --git a/62-google-croscore-tinos-fontconfig.conf b/62-google-croscore-tinos-fontconfig.conf
index 3ed227c..2d177b0 100644
--- a/62-google-croscore-tinos-fontconfig.conf
+++ b/62-google-croscore-tinos-fontconfig.conf
@@ -2,43 +2,28 @@
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
<alias>
- <family>serif</family>
- <prefer>
- <family>Tinos</family>
- </prefer>
+ <family>serif</family>
+ <prefer>
+ <family>Tinos</family>
+ </prefer>
</alias>
<alias>
- <family>Tinos</family>
- <default>
- <family>serif</family>
- </default>
+ <family>Tinos</family>
+ <default>
+ <family>serif</family>
+ </default>
</alias>
<alias binding="same">
- <family>Liberation Serif</family>
- <accept>
- <family>Tinos</family>
- </accept>
+ <family>Liberation Serif</family>
+ <accept>
+ <family>Tinos</family>
+ </accept>
</alias>
<alias binding="same">
- <family>Tinos</family>
- <accept>
- <family>Liberation Serif</family>
- </accept>
- </alias>
-
- <!-- Microsoft -->
- <alias binding="same">
<family>Tinos</family>
- <default>
- <family>Times New Roman</family>
- </default>
- </alias>
- <alias binding="same">
- <family>Times New Roman</family>
- <default>
- <family>Tinos</family>
- </default>
+ <accept>
+ <family>Liberation Serif</family>
+ </accept>
</alias>
-
</fontconfig>
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.
- Previous message: [google-croscore-fonts/f17] Resolves:rh#814631-Typo in 62-google-croscore-cousine-fontconfig.conf
- Next message: [Bug 806270] CVE-2012-{1126, 1127, 1128, 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144} freetype: multiple vulnerabilities [fedora-all]
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fonts-bugs
mailing list