rpms/google-droid-fonts/devel .cvsignore, 1.2, 1.3 google-droid-fonts-sans-fontconfig.conf, 1.1, 1.2 google-droid-fonts.spec, 1.7, 1.8 import.log, 1.4, 1.5 sources, 1.2, 1.3
nim
nim at fedoraproject.org
Sat Jul 25 10:54:37 UTC 2009
Author: nim
Update of /cvs/extras/rpms/google-droid-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30201/devel
Modified Files:
.cvsignore google-droid-fonts-sans-fontconfig.conf
google-droid-fonts.spec import.log sources
Log Message:
Ja
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 16 Jan 2009 22:10:39 -0000 1.2
+++ .cvsignore 25 Jul 2009 10:54:37 -0000 1.3
@@ -6,3 +6,4 @@ DroidSerif-Bold.ttf
DroidSerif-BoldItalic.ttf
DroidSerif-Italic.ttf
DroidSerif-Regular.ttf
+DroidSansJapanese.ttf
Index: google-droid-fonts-sans-fontconfig.conf
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts-sans-fontconfig.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- google-droid-fonts-sans-fontconfig.conf 16 Jan 2009 22:10:40 -0000 1.1
+++ google-droid-fonts-sans-fontconfig.conf 25 Jul 2009 10:54:37 -0000 1.2
@@ -13,7 +13,22 @@
<family>sans-serif</family>
</default>
</alias>
+ <!-- CJK users should check this actually works for them -->
<match target="scan">
+ <test name="lang">
+ <string>ja-jp</string>
+ </test>
+ <test name="family">
+ <string>Droid Sans Japanese</string>
+ </test>
+ <edit name="family">
+ <string>Droid Sans</string>
+ </edit>
+ </match>
+ <match target="scan">
+ <test name="lang" compare="not_eq">
+ <string>ja-jp</string>
+ </test>
<test name="family">
<string>Droid Sans Fallback</string>
</test>
Index: google-droid-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/google-droid-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- google-droid-fonts.spec 25 Jul 2009 01:03:49 -0000 1.7
+++ google-droid-fonts.spec 25 Jul 2009 10:54:37 -0000 1.8
@@ -1,6 +1,6 @@
%global fontname google-droid
-%global download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts
+%global download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/
%global common_desc \
The Droid typeface family was designed in the fall of 2006 by Ascender's \
@@ -10,27 +10,29 @@ on a mobile handset when rendered in app
other screen text.
Name: %{fontname}-fonts
-# The font files all have the same version except for sans fallback which I'm going to ignore here
-Version: 1.0.112
-Release: 7%{?dist}
+# No sane versionning upstream
+Version: 20090320
+Epoch: 1
+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}/DroidSansFallback.ttf
-Source4: %{download_root}/DroidSansMono.ttf
-Source5: %{download_root}/DroidSerif-Regular.ttf
-Source6: %{download_root}/DroidSerif-Bold.ttf
-Source7: %{download_root}/DroidSerif-Italic.ttf
-Source8: %{download_root}/DroidSerif-BoldItalic.ttf
-Source9: %{download_root}/NOTICE
-Source10: %{download_root}/README.txt
-Source11: %{name}-sans-fontconfig.conf
-Source12: %{name}-sans-mono-fontconfig.conf
-Source13: %{name}-serif-fontconfig.conf
+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
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
@@ -59,7 +61,7 @@ Requires: %{name}-common = %{version}-%{
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 DroidSansFallback.ttf
+%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans.ttf DroidSans-Bold.ttf DroidSansJapanese.ttf DroidSansFallback.ttf
%package -n %{fontname}-sans-mono-fonts
@@ -93,8 +95,8 @@ companion Droid Sans.
%prep
%setup -q -c -T
-install -m 0644 -p %{SOURCE9} notice.txt
-install -m 0644 -p %{SOURCE10} readme.txt
+install -m 0644 -p %{SOURCE20} notice.txt
+install -m 0644 -p %{SOURCE21} readme.txt
%build
@@ -106,16 +108,17 @@ rm -fr %{buildroot}
install -m 0755 -d %{buildroot}%{_fontdir}
install -m 0644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
- %{SOURCE6} %{SOURCE7} %{SOURCE8} %{buildroot}%{_fontdir}
+ %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} \
+ %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
-install -m 0644 -p %{SOURCE11} \
+install -m 0644 -p %{SOURCE31} \
%{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
-install -m 0644 -p %{SOURCE12} \
+install -m 0644 -p %{SOURCE32} \
%{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
-install -m 0644 -p %{SOURCE13} \
+install -m 0644 -p %{SOURCE33} \
%{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf
for fontconf in 65-%{fontname}-sans.conf \
@@ -136,7 +139,12 @@ rm -fr %{buildroot}
%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.112-7
+* Sat Jul 25 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090320-1
+— try to fit Japanese in
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 1.0.112-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.112-6
Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log 23 Feb 2009 08:57:19 -0000 1.4
+++ import.log 25 Jul 2009 10:54:37 -0000 1.5
@@ -2,3 +2,4 @@ google-droid-fonts-1_0_112-2_fc11:HEAD:g
google-droid-fonts-1_0_112-3_fc11:HEAD:google-droid-fonts-1.0.112-3.fc11.src.rpm:1232144541
google-droid-fonts-1_0_112-4_fc11:HEAD:google-droid-fonts-1.0.112-4.fc11.src.rpm:1233428004
google-droid-fonts-1_0_112-5_fc11:HEAD:google-droid-fonts-1.0.112-5.fc11.src.rpm:1235379417
+google-droid-fonts-20090320-1_fc12:HEAD:google-droid-fonts-20090320-1.fc12.src.rpm:1248519226
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/google-droid-fonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 16 Jan 2009 22:10:40 -0000 1.2
+++ sources 25 Jul 2009 10:54:37 -0000 1.3
@@ -6,3 +6,4 @@
a062025df92affc1331a05b7c07793fc DroidSerif-BoldItalic.ttf
a2e7305a0ba8bb7091124f4cd1485fc9 DroidSerif-Italic.ttf
bfb2f44a7c1deba39f7f4d39bff18eeb DroidSerif-Regular.ttf
+8fbc87c7c5089a8e86c670b93a78964f DroidSansJapanese.ttf
More information about the Fedora-fonts-bugs-list
mailing list