[google-droid-fonts] Update to current android git state

nim nim at fedoraproject.org
Sun Jul 15 19:36:52 UTC 2012


commit e3d3312b6927ed0aa932637b9f6d92ee3ef505d6
Author: Nicolas Mailhot <nim at fedoraproject.org>
Date:   Sun Jul 15 21:36:28 2012 +0200

    Update to current android git state

 .gitignore                               |    1 +
 NOTICE                                   |  190 ----------------------------
 README.txt                               |   18 ---
 getdroid.sh                              |   24 ++++
 google-droid-fonts-sans-fontconfig.conf  |  200 ++++++++++++++++++++++++++++--
 google-droid-fonts-serif-fontconfig.conf |   48 +++++++
 google-droid-fonts.spec                  |   91 +++++++-------
 sources                                  |   13 +--
 8 files changed, 307 insertions(+), 278 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2856269..3b8db59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ DroidSansArabic.ttf
 DroidSansFallback.ttf
 DroidSansHebrew.ttf
 DroidSansThai.ttf
+/google-droid-fonts-20120715.tar.xz
diff --git a/getdroid.sh b/getdroid.sh
new file mode 100755
index 0000000..774501a
--- /dev/null
+++ b/getdroid.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#Try to get upstream latest files
+
+DATE=$(date -u +%Y%m%d)
+ARCHIVE="google-droid-fonts-$DATE"
+TMPDIR=$(mktemp -d --tmpdir=/var/tmp getdroid-XXXXXXXXXX)
+[ $? != 0 ] && exit 1
+umask 022
+pushd "$TMPDIR"
+git init
+git remote add -t HEAD origin https://android.googlesource.com/platform/frameworks/base.git
+git config core.sparseCheckout true
+cat > .git/info/sparse-checkout << EOF
+data/fonts/*
+!data/fonts/*ttf
+data/fonts/Droid*
+EOF
+git pull --depth=1 --no-tags origin HEAD
+mv data/fonts "$ARCHIVE"
+chmod -x "$ARCHIVE/*.ttf"
+tar -cvJf "$ARCHIVE.tar.xz" "$ARCHIVE"
+popd
+mv "$TMPDIR/$ARCHIVE.tar.xz" .
+rm -fr "$TMPDIR"
diff --git a/google-droid-fonts-sans-fontconfig.conf b/google-droid-fonts-sans-fontconfig.conf
index 80ba66c..76e9dcc 100644
--- a/google-droid-fonts-sans-fontconfig.conf
+++ b/google-droid-fonts-sans-fontconfig.conf
@@ -6,11 +6,11 @@
       <string>Droid Sans</string>
     </test>
     <edit name="fontversion">
-      <int>7</int>
+      <int>12</int>
     </edit>
   </match>
   <match target="scan">
-    <test name="family">
+    <test name="fullname">
       <string>Droid Sans Hebrew</string>
     </test>
     <edit name="family">
@@ -20,12 +20,124 @@
       <string>Droid Sans</string>
     </edit>
     <edit name="fontversion">
+      <int>11</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Hebrew Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>11</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Armenian</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>10</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Georgian</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>9</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Ethiopic</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>8</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Ethiopic Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>8</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Kufi</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>7</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Kufi Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>7</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Devanagari</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 name="fullname">
+      <string>Droid Sans Tamil</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
@@ -38,7 +150,21 @@
     </edit>
   </match>
   <match target="scan">
-    <test name="family">
+    <test name="fullname">
+      <string>Droid Sans Tamil Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>5</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
       <string>Droid Sans Thai</string>
     </test>
     <edit name="family">
@@ -54,12 +180,20 @@
   <match target="scan">
     <test name="lang" compare="not_eq">
       <string>zh-cn</string>
+    </test>
+    <test name="lang" compare="not_eq">
       <string>zh-sg</string>
+    </test>
+    <test name="lang" compare="not_eq">
       <string>zh-hk</string>
+    </test>
+    <test name="lang" compare="not_eq">
       <string>zh-tw</string>
+    </test>
+    <test name="lang" compare="not_eq">
       <string>zh</string>
     </test>
-    <test name="family">
+    <test name="fullname">
       <string>Droid Sans Japanese</string>
     </test>
     <edit name="family">
@@ -73,7 +207,7 @@
     </edit>
   </match>
   <match target="scan">
-    <test name="family">
+    <test name="fullname">
       <string>Droid Sans Fallback</string>
     </test>
     <edit name="family">
@@ -87,14 +221,22 @@
     </edit>
   </match>
   <match target="scan">
-    <test name="lang">
+    <test name="lang" compare="eq">
       <string>zh-cn</string>
+    </test>
+    <test name="lang" compare="eq">
       <string>zh-sg</string>
+    </test>
+    <test name="lang" compare="eq">
       <string>zh-hk</string>
+    </test>
+    <test name="lang" compare="eq">
       <string>zh-tw</string>
+    </test>
+    <test name="lang" compare="eq">
       <string>zh</string>
     </test>
-    <test name="family">
+    <test name="fullname">
       <string>Droid Sans Japanese</string>
     </test>
     <edit name="family">
@@ -108,12 +250,48 @@
     </edit>
   </match>
   <alias binding="same">
+    <family>Droid Arabic Kufi</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
     <family>Droid Sans Arabic</family>
     <accept>
       <family>Droid Sans</family>
     </accept>
   </alias>
   <alias binding="same">
+    <family>Droid Sans Armenian</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Devanagari</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Ethiopic</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Georgian</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
     <family>Droid Sans Hebrew</family>
     <accept>
       <family>Droid Sans</family>
@@ -126,13 +304,13 @@
     </accept>
   </alias>
   <alias binding="same">
-    <family>Droid Sans Thai</family>
+    <family>Droid Sans Tamil</family>
     <accept>
       <family>Droid Sans</family>
     </accept>
   </alias>
   <alias binding="same">
-    <family>Droid Sans Fallback</family>
+    <family>Droid Sans Thai</family>
     <accept>
       <family>Droid Sans</family>
     </accept>
diff --git a/google-droid-fonts-serif-fontconfig.conf b/google-droid-fonts-serif-fontconfig.conf
index f56b5ed..368f361 100644
--- a/google-droid-fonts-serif-fontconfig.conf
+++ b/google-droid-fonts-serif-fontconfig.conf
@@ -1,6 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Serif</string>
+    </test>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Naskh</string>
+    </test>
+    <edit name="family">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Arabic Naskh Bold</string>
+    </test>
+    <edit name="family">
+      <string>Droid Serif</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Serif Bold</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Droid Arabic Naskh</family>
+    <accept>
+      <family>Droid Serif</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Naskh Shift Alt</family>
+    <accept>
+      <family>Droid Serif</family>
+    </accept>
+  </alias>
   <alias>
     <family>serif</family>
     <prefer>
diff --git a/google-droid-fonts.spec b/google-droid-fonts.spec
index f24c739..cd45352 100644
--- a/google-droid-fonts.spec
+++ b/google-droid-fonts.spec
@@ -1,41 +1,30 @@
 %global fontname google-droid
-
-%global download_root http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/
+%global archivename %{name}-%{version}
 
 %global common_desc \
 The Droid typeface family was designed in the fall of 2006 by Ascender's \
 Steve Matteson, as a commission from Google to create a set of system fonts \
 for its Android platform. The goal was to provide optimal quality and comfort \
 on a mobile handset when rendered in application menus, web browsers and for \
-other screen text.
+other screen text. \
+The family was later extended by other designers such as Pascal Zoghbi of \
+29ArabicLetters for Naskh and Kufi.
 
 Name:    %{fontname}-fonts
-# No sane versionning upstream, use the most recent file datestamp
-Version: 20100409
-Release: 3%{?dist}
+# No sane versionning upstream, use git clone timestamp
+Version: 20120715
+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
-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
+URL:       https://android.googlesource.com/
+Source0:   %{archivename}.tar.xz
+#Brutal script used to pull sources from upstream git
+Source1:   getdroid.sh
+Source10:  %{name}-sans-fontconfig.conf
+Source11:  %{name}-sans-mono-fontconfig.conf
+Source12:  %{name}-serif-fontconfig.conf
 
 
 BuildArch:     noarch
@@ -56,8 +45,8 @@ Obsoletes: %{name}-common <= 20090906-5.fc12
 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 DroidSansArabic.ttf DroidSansHebrew.ttf DroidSansJapanese.ttf DroidSansThai.ttf DroidSansFallback.ttf
-%doc *.txt
+%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSansArmenian.ttf DroidSans-Bold.ttf DroidSansDevanagari-Regular.ttf DroidSansEthiopic-Bold.ttf DroidSansEthiopic-Regular.ttf DroidSansFallback.ttf DroidSansGeorgian.ttf DroidSansHebrew-Bold.ttf DroidSansHebrew-Regular.ttf DroidSansJapanese.ttf DroidSansTamil-Bold.ttf DroidSansTamil-Regular.ttf DroidSansThai.ttf DroidSans.ttf DroidKufi*ttf
+%doc README.txt NOTICE
 
 %package -n %{fontname}-sans-mono-fonts
 Summary:  A humanist monospace sans serif typeface
@@ -70,7 +59,7 @@ 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
+%doc README.txt NOTICE
 
 %package -n %{fontname}-serif-fonts
 Summary:  A contemporary serif typeface
@@ -85,13 +74,11 @@ text displayed on small screens. Vertical stress and open forms contribute to
 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
+%_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf DroidNaskh*ttf
+%doc README.txt NOTICE
 
 %prep
-%setup -q -c -T
-install -m 0644 -p %{SOURCE0} notice.txt
-install -m 0644 -p %{SOURCE1} readme.txt
+%setup -q -n %{archivename}
 
 
 %build
@@ -102,25 +89,25 @@ rm -fr %{buildroot}
 
 install -m 0755 -d %{buildroot}%{_fontdir}
 
-install -m 0644 -p  %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
-                    %{SOURCE14} %{SOURCE15} %{SOURCE16} \
-                    %{SOURCE20} \
-                    %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33}\
+install -m 0644 -p $(ls *ttf | grep -v DroidSansFallbackFull\
+                             | grep -v DroidSansFallbackLegacy\
+                             | grep -v DroidSansArabic\
+                             | grep -v DroidNaskh-Regular-SystemUI) \
                     %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
 
-install -m 0644 -p %{SOURCE41} \
+install -m 0644 -p %{SOURCE10} \
         %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-sans.conf
-install -m 0644 -p %{SOURCE42} \
+install -m 0644 -p %{SOURCE11} \
         %{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
-install -m 0644 -p %{SOURCE43} \
-        %{buildroot}%{_fontconfig_templatedir}/59-%{fontname}-serif.conf
+install -m 0644 -p %{SOURCE12} \
+        %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-serif.conf
 
 for fontconf in 65-%{fontname}-sans.conf \
                 60-%{fontname}-sans-mono.conf \
-                59-%{fontname}-serif.conf ; do
+                65-%{fontname}-serif.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf \
         %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
@@ -131,11 +118,21 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20100409-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20100409-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sun Jul 15 2012 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20120715-1
+— Switch to new upstream git source (marginally less hopeless than the Google
+  Font Directory)
+— Remove Arabic, add Armenian, Devanagari, Ethiopic, Georgian, Tamil, Kufi to Sans
+– Add Naskh to Serif
+– Try to adapt fontconfig rules to new upstream rules and new fonts
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20100409-3
+– Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- 20100409-2
+– Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Sun Jul 25 2010 Nicolas Mailhot <nicolas.mailhot at laposte.net>
 - 20100409-1
diff --git a/sources b/sources
index 9bcac82..0914fa5 100644
--- a/sources
+++ b/sources
@@ -1,12 +1 @@
-2afdf28d5cdd079b41968cdabf1b469e  DroidSans-Bold.ttf
-9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.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
+b1aef1f9f9bf61f521aeb4efd1239dd8  google-droid-fonts-20120715.tar.xz


More information about the fonts-bugs mailing list