- up to 20121204; updated configs from fc

diff --git a/fonts-TTF-Google-Droid-kufi.fontconfig b/fonts-TTF-Google-Droid-kufi.fontconfig
new file mode 100644 (file)
index 0000000..4d368eb
--- /dev/null
+++ b/fonts-TTF-Google-Droid-kufi.fontconfig
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>fantasy</family>
+    <prefer>
+      <family>Droid Arabic Kufi</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Arabic Kufi</family>
+    <default>
+      <family>Droid Sans</family>
+    </default>
+  </alias>
+</fontconfig>

diff --git a/fonts-TTF-Google-Droid-sans-mono.fontconfig b/fonts-TTF-Google-Droid-sans-mono.fontconfig
index 5c7f475419715ba4568457951f79284cbd1152cf..1cf8bbc1602be23a191f84f6fc0109e79b6b37e7 100644 (file)
--- a/fonts-TTF-Google-Droid-sans-mono.fontconfig
+++ b/fonts-TTF-Google-Droid-sans-mono.fontconfig
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
     <family>monospace</family>

diff --git a/fonts-TTF-Google-Droid-sans.fontconfig b/fonts-TTF-Google-Droid-sans.fontconfig
index 6e08254bdaffc050bb7eccacc817c6ec7781e60f..dc9845c1159e1f9a39e5c63ffdd9d5d38fd0360a 100644 (file)
--- a/fonts-TTF-Google-Droid-sans.fontconfig
+++ b/fonts-TTF-Google-Droid-sans.fontconfig
@@ -1,6 +1,300 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans</string>
+    </test>
+    <edit name="fontversion">
+      <int>12</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <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>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 Sans Arabic</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 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="fullname">
+      <string>Droid Sans Tamil</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="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">
+      <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>
+    </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="fullname">
+      <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>3</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="fullname">
+      <string>Droid Sans Fallback</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <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="fullname">
+      <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 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>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Tamil</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Thai</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
   <alias>
     <family>sans-serif</family>
     <prefer>
@@ -13,12 +307,4 @@
       <family>sans-serif</family>
     </default>
   </alias>
-  <match target="scan">
-    <test name="family">
-      <string>Droid Sans Fallback</string>
-    </test>
-    <edit name="family">
-      <string>Droid Sans</string>
-    </edit>
-  </match>
 </fontconfig>

diff --git a/fonts-TTF-Google-Droid-serif.fontconfig b/fonts-TTF-Google-Droid-serif.fontconfig
index 30c15015fcb21120b2063bb12e1934ca86e8b84a..368f361eae54220605da5665ec902d97c0278377 100644 (file)
--- a/fonts-TTF-Google-Droid-serif.fontconfig
+++ b/fonts-TTF-Google-Droid-serif.fontconfig
@@ -1,6 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!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/fonts-TTF-Google-Droid.spec b/fonts-TTF-Google-Droid.spec
index fea60cb0b52988335c8af214068e4d9408f0e6cc..9e3b150b1e4dbad9c1071e4e124cbde0aba5c620 100644 (file)
--- a/fonts-TTF-Google-Droid.spec
+++ b/fonts-TTF-Google-Droid.spec
@@ -1,14 +1,17 @@
+%define        snap    20121204
 Summary:       General-purpose fonts released by Google as part of Android
 Name:          fonts-TTF-Google-Droid
-Version:       1.0.0.112
-Release:       3
+Version:       1.0.2
+Release:       1.%{snap}.1
 License:       Apache v2.0
 Group:         Fonts
-Source0:       google-droid.tar.gz
+Source0:       google-droid-fonts-%{snap}.tar.xz
 # Source0-md5: db7948a148a065a59c48db27afa16b5d
-Source1:       %{name}-sans.fontconfig
-Source2:       %{name}-sans-mono.fontconfig
-Source3:       %{name}-serif.fontconfig
+Source1:       getdroid.sh
+Source10:      %{name}-sans.fontconfig
+Source11:      %{name}-sans-mono.fontconfig
+Source12:      %{name}-serif.fontconfig
+Source13:      %{name}-kufi.fontconfig
 URL:           http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/TTF
@@ -19,15 +22,17 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _ttffontsdir    %{_fontsdir}/TTF
 
 %description
-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.
+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.
 
 %prep
-%setup -q -n base
-rm -f Ahem.ttf
+%setup -q -n google-droid-fonts-%{snap}
+rm DroidSansFallbackFull*
+rm DroidSansFallbackLegacy*
+rm DroidNaskh-Regular-SystemUI*
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,12 +41,15 @@ install -d $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/65-droid-sans.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/59-droid-serif.conf
-ln -s %{_datadir}/fontconfig/conf.avail/65-droid-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s %{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
-ln -s %{_datadir}/fontconfig/conf.avail/59-droid-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+install %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/65-google-droid-sans.conf
+install %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/60-google-droid-sans-mono.conf
+install %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/65-google-droid-serif.conf
+install %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/fontconfig/conf.avail/65-google-droid-kufi.conf
+
+ln -s %{_datadir}/fontconfig/conf.avail/65-google-droid-sans.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/60-google-droid-sans-mono.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/65-google-droid-serif.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
+ln -s %{_datadir}/fontconfig/conf.avail/65-google-droid-kufi.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,9 +63,11 @@ fontpostinst TTF
 %files
 %defattr(644,root,root,755)
 %{_ttffontsdir}/Droid*.ttf
-%{_datadir}/fontconfig/conf.avail/59-droid-serif.conf
-%{_datadir}/fontconfig/conf.avail/60-droid-sans-mono.conf
-%{_datadir}/fontconfig/conf.avail/65-droid-sans.conf
-%{_sysconfdir}/fonts/conf.d/59-droid-serif.conf
-%{_sysconfdir}/fonts/conf.d/60-droid-sans-mono.conf
-%{_sysconfdir}/fonts/conf.d/65-droid-sans.conf
+%{_datadir}/fontconfig/conf.avail/65-google-droid-serif.conf
+%{_datadir}/fontconfig/conf.avail/60-google-droid-sans-mono.conf
+%{_datadir}/fontconfig/conf.avail/65-google-droid-sans.conf
+%{_datadir}/fontconfig/conf.avail/65-google-droid-kufi.conf
+%{_sysconfdir}/fonts/conf.d/65-google-droid-serif.conf
+%{_sysconfdir}/fonts/conf.d/60-google-droid-sans-mono.conf
+%{_sysconfdir}/fonts/conf.d/65-google-droid-sans.conf
+%{_sysconfdir}/fonts/conf.d/65-google-droid-kufi.conf

diff --git a/getdroid.sh b/getdroid.sh
new file mode 100755 (executable)
index 0000000..b1bb540
--- /dev/null
+++ b/getdroid.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#Try to get upstream latest files (from fc)
+
+DATE=$(date -u +%Y%m%d)
+ARCHIVE="google-droid-fonts-$DATE"
+TMPDIR=$(mktemp -d --tmpdir=/var/tmp getdroid-XXXXXXXXXX)
+[ $? != 0 ] && exit 1
+umask 022
+olddir=$(pwd)
+cd "$TMPDIR" || exit 1
+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 --no-tags origin HEAD
+LDATE=$(git log --first-parent --format='%ci' -n 1 master data/fonts)
+DATE=$(date "+%Y%m%d" -d ${LDATE%% *})
+ARCHIVE="google-droid-fonts-$DATE"
+git log data/fonts > ChangeLog
+mv data/fonts "$ARCHIVE"
+mv ChangeLog "$ARCHIVE/ChangeLog"
+chmod -x $ARCHIVE/*.ttf
+tar -cvJf "$ARCHIVE.tar.xz" "$ARCHIVE"
+cd "$olddir"
+mv "$TMPDIR/$ARCHIVE.tar.xz" .
+rm -fr "$TMPDIR"