Update to latest version, add Arabic/Hebrew/Thai support to Sans

This commit is contained in:
nim 2010-07-25 21:45:28 +00:00
parent 7e34343080
commit 0b500b5100
5 changed files with 144 additions and 51 deletions

View File

@ -1,9 +1,12 @@
DroidSans-Bold.ttf
DroidSans.ttf
DroidSansFallback.ttf
DroidSansJapanese.ttf
DroidSansMono.ttf
DroidSerif-Bold.ttf
DroidSerif-BoldItalic.ttf
DroidSerif-Italic.ttf
DroidSerif-Regular.ttf
DroidSansArabic.ttf
DroidSansFallback.ttf
DroidSansHebrew.ttf
DroidSansThai.ttf

View File

@ -6,10 +6,59 @@
<string>Droid Sans</string>
</test>
<edit name="fontversion">
<int>3</int>
<int>7</int>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Droid Sans Hebrew</string>
</test>
<edit name="family">
<string>Droid Sans</string>
</edit>
<edit name="fullname">
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>6</int>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Droid Sans Arabic</string>
</test>
<edit name="family">
<string>Droid Sans</string>
</edit>
<edit name="fullname">
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>5</int>
</edit>
</match>
<match target="scan">
<test name="family">
<string>Droid Sans Thai</string>
</test>
<edit name="family">
<string>Droid Sans</string>
</edit>
<edit name="fullname">
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>4</int>
</edit>
</match>
<match target="scan">
<test name="lang" compare="not_eq">
<string>zh-cn</string>
<string>zh-sg</string>
<string>zh-hk</string>
<string>zh-tw</string>
<string>zh</string>
</test>
<test name="family">
<string>Droid Sans Japanese</string>
</test>
@ -20,7 +69,7 @@
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>2</int>
<int>3</int>
</edit>
</match>
<match target="scan">
@ -33,16 +82,55 @@
<edit name="fullname">
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>2</int>
</edit>
</match>
<match target="scan">
<test name="lang">
<string>zh-cn</string>
<string>zh-sg</string>
<string>zh-hk</string>
<string>zh-tw</string>
<string>zh</string>
</test>
<test name="family">
<string>Droid Sans Japanese</string>
</test>
<edit name="family">
<string>Droid Sans</string>
</edit>
<edit name="fullname">
<string>Droid Sans</string>
</edit>
<edit name="fontversion">
<int>1</int>
</edit>
</match>
<alias binding="same">
<family>Droid Sans Arabic</family>
<accept>
<family>Droid Sans</family>
</accept>
</alias>
<alias binding="same">
<family>Droid Sans Hebrew</family>
<accept>
<family>Droid Sans</family>
</accept>
</alias>
<alias binding="same">
<family>Droid Sans Japanese</family>
<accept>
<family>Droid Sans</family>
</accept>
</alias>
<alias binding="same">
<family>Droid Sans Thai</family>
<accept>
<family>Droid Sans</family>
</accept>
</alias>
<alias binding="same">
<family>Droid Sans Fallback</family>
<accept>

View File

@ -10,28 +10,32 @@ on a mobile handset when rendered in application menus, web browsers and for \
other screen text.
Name: %{fontname}-fonts
# No sane versionning upstream, use the date we did a git dump
Version: 20090906
Release: 5%{?dist}
# No sane versionning upstream, use the most recent file datestamp
Version: 20100409
Release: 1%{?dist}
Summary: General-purpose fonts released by Google as part of Android
Group: User Interface/X
License: ASL 2.0
URL: http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
Source1: %{download_root}DroidSans.ttf
Source2: %{download_root}DroidSans-Bold.ttf
Source3: %{download_root}DroidSansJapanese.ttf
Source4: %{download_root}DroidSansFallback.ttf
Source5: %{download_root}DroidSansMono.ttf
Source6: %{download_root}DroidSerif-Regular.ttf
Source7: %{download_root}DroidSerif-Bold.ttf
Source8: %{download_root}DroidSerif-Italic.ttf
Source9: %{download_root}DroidSerif-BoldItalic.ttf
Source20: %{download_root}NOTICE
Source21: %{download_root}README.txt
Source31: %{name}-sans-fontconfig.conf
Source32: %{name}-sans-mono-fontconfig.conf
Source33: %{name}-serif-fontconfig.conf
Source0: %{download_root}NOTICE
Source1: %{download_root}README.txt
Source10: %{download_root}DroidSans.ttf
Source11: %{download_root}DroidSans-Bold.ttf
Source12: %{download_root}DroidSansJapanese.ttf
#DroidSansFallbackLegacy.ttf is an old version with less coverage
Source13: %{download_root}DroidSansFallback.ttf
Source14: %{download_root}DroidSansArabic.ttf
Source15: %{download_root}DroidSansHebrew.ttf
Source16: %{download_root}DroidSansThai.ttf
Source20: %{download_root}DroidSansMono.ttf
Source30: %{download_root}DroidSerif-Regular.ttf
Source31: %{download_root}DroidSerif-Bold.ttf
Source32: %{download_root}DroidSerif-Italic.ttf
Source33: %{download_root}DroidSerif-BoldItalic.ttf
Source41: %{name}-sans-fontconfig.conf
Source42: %{name}-sans-mono-fontconfig.conf
Source43: %{name}-serif-fontconfig.conf
BuildArch: noarch
@ -41,18 +45,10 @@ BuildRequires: fontpackages-devel
%common_desc
%package common
Summary: Common files of the Droid font set
Requires: fontpackages-filesystem
%description common
%common_desc
This package consists of files used by other %{name} packages.
%package -n %{fontname}-sans-fonts
Summary: A humanist sans serif typeface
Requires: %{name}-common = %{version}-%{release}
Summary: A humanist sans serif typeface
Requires: fontpackages-filesystem
Obsoletes: %{name}-common <= 20090906-5.fc12
%description -n %{fontname}-sans-fonts
%common_desc
@ -60,12 +56,12 @@ Requires: %{name}-common = %{version}-%{release}
Droid Sans is a humanist sans serif typeface designed for user interfaces and
electronic communication.
%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansJapanese.ttf DroidSansFallback.ttf
%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansArabic.ttf DroidSansHebrew.ttf DroidSansJapanese.ttf DroidSansThai.ttf DroidSansFallback.ttf
%doc *.txt
%package -n %{fontname}-sans-mono-fonts
Summary: A humanist monospace sans serif typeface
Requires: %{name}-common = %{version}-%{release}
Requires: fontpackages-filesystem
%description -n %{fontname}-sans-mono-fonts
%common_desc
@ -74,11 +70,11 @@ Droid Sans Mono is a humanist monospace sans serif typeface designed for user
interfaces and electronic communication.
%_font_pkg -n sans-mono -f ??-%{fontname}-sans-mono.conf DroidSansMono.ttf
%doc *.txt
%package -n %{fontname}-serif-fonts
Summary: A serif typeface
Requires: %{name}-common = %{version}-%{release}
Summary: A contemporary serif typeface
Requires: fontpackages-filesystem
%description -n %{fontname}-serif-fonts
%common_desc
@ -90,12 +86,12 @@ its readability while its proportion and overall design complement its
companion Droid Sans.
%_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf
%doc *.txt
%prep
%setup -q -c -T
install -m 0644 -p %{SOURCE20} notice.txt
install -m 0644 -p %{SOURCE21} readme.txt
install -m 0644 -p %{SOURCE0} notice.txt
install -m 0644 -p %{SOURCE1} readme.txt
%build
@ -106,18 +102,20 @@ rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} \
install -m 0644 -p %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
%{SOURCE14} %{SOURCE15} %{SOURCE16} \
%{SOURCE20} \
%{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33}\
%{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE31} \
install -m 0644 -p %{SOURCE41} \
%{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
install -m 0644 -p %{SOURCE32} \
install -m 0644 -p %{SOURCE42} \
%{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
install -m 0644 -p %{SOURCE33} \
install -m 0644 -p %{SOURCE43} \
%{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf
for fontconf in 65-%{fontname}-sans.conf \
@ -132,12 +130,12 @@ done
rm -fr %{buildroot}
%files common
%defattr(0644,root,root,0755)
%doc *.txt
%changelog
* Sun Jul 25 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20100409-1
Update to upstream's latest data dump
Add Arabic, Hebrew, Thai coverage to Sans
* Mon Sep 28 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
- 20090906-5
Tweak the fontconfig fixing

View File

@ -9,3 +9,4 @@ google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.r
google-droid-fonts-20090906-3_fc12:HEAD:google-droid-fonts-20090906-3.fc12.src.rpm:1252833055
google-droid-fonts-20090906-4_fc12:HEAD:google-droid-fonts-20090906-4.fc12.src.rpm:1252849244
google-droid-fonts-20090906-5_fc12:HEAD:google-droid-fonts-20090906-5.fc12.src.rpm:1254127710
google-droid-fonts-20100409-1_fc14:HEAD:google-droid-fonts-20100409-1.fc14.src.rpm:1280094291

View File

@ -1,9 +1,12 @@
2afdf28d5cdd079b41968cdabf1b469e DroidSans-Bold.ttf
9d83fb20700a3a7c45dc9acd64ab121e DroidSans.ttf
4caeadd734f4be9973163bdf02ea6cf5 DroidSansFallback.ttf
6d7e0d083e3c5e1b504e580b4e2fe7db DroidSansJapanese.ttf
3922dfe38a36da7d6edfb1fe77b276fb DroidSansMono.ttf
849a92990a80cbb665bfc74fd03743bd DroidSerif-Bold.ttf
a062025df92affc1331a05b7c07793fc DroidSerif-BoldItalic.ttf
a2e7305a0ba8bb7091124f4cd1485fc9 DroidSerif-Italic.ttf
bfb2f44a7c1deba39f7f4d39bff18eeb DroidSerif-Regular.ttf
4ec3ddfceaea0406a9cf8d605926892a DroidSansArabic.ttf
5931b08bba8127286c06ea0061df0088 DroidSansFallback.ttf
2471e017e0bae8d66cadb9d7355a65b7 DroidSansHebrew.ttf
6467be15f37d86a9356f6b20d83075b0 DroidSansThai.ttf