config files with kufi split

google-droid-fonts-kufi-fontconfig.conf

@@ -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>

google-droid-fonts-sans-fontconfig.conf

@@ -95,7 +95,7 @@
   </match>
   <match target="scan">
     <test name="fullname">
-      <string>Droid Arabic Kufi</string>
+      <string>Droid Sans Arabic</string>
     </test>
     <edit name="family">
       <string>Droid Sans</string>
@@ -107,20 +107,6 @@
       <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>
@@ -249,12 +235,6 @@
       <int>1</int>
     </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>

google-droid-fonts.spec

@@ -7,13 +7,13 @@ 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 family was later extended by other designers such as Pascal Zoghbi of \
-29ArabicLetters for Naskh and Kufi.
+The family was later extended in collaboration with other designers such as \
+Pascal Zoghbi of 29ArabicLetters.
 
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use git clone timestamp
 Version: 20120715
-Release: 1%{?dist}
+Release: 3%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -25,6 +25,7 @@ Source1:   getdroid.sh
 Source10:  %{name}-sans-fontconfig.conf
 Source11:  %{name}-sans-mono-fontconfig.conf
 Source12:  %{name}-serif-fontconfig.conf
+Source13:  %{name}-kufi-fontconfig.conf
 
 
 BuildArch:     noarch
@@ -45,7 +46,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 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
+%_font_pkg -n sans -f ??-%{fontname}-sans.conf DroidSans*ttf
+%exclude %{_fontdir}/DroidSansMono*ttf
 %doc README.txt NOTICE
 
 %package -n %{fontname}-sans-mono-fonts
@@ -64,6 +66,7 @@ interfaces and electronic communication.
 %package -n %{fontname}-serif-fonts
 Summary:  A contemporary serif typeface
 Requires: fontpackages-filesystem
+Provides: %{fontname}-naskh-fonts = %{version}-%{release}
 
 %description -n %{fontname}-serif-fonts
 %common_desc
@@ -73,10 +76,27 @@ reading on screen. Droid Serif is slightly condensed to maximize the amount of
 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.
+The Arabic block was designed by Pascal Zoghbi of 29ArabicLetters under the
+Droid Naskh name.
 
 %_font_pkg -n serif -f ??-%{fontname}-serif.conf DroidSerif*ttf DroidNaskh*ttf
 %doc README.txt NOTICE
 
+%package -n %{fontname}-kufi-fonts
+Summary:  A kufi Arabic titling typeface designed to complement Droid Sans
+Requires: fontpackages-filesystem
+Requires: %{fontname}-kufi-fonts
+
+%description -n %{fontname}-kufi-fonts
+%common_desc
+
+Droid Kufi is a stylized display font suitable for titles and short runs of
+text, and designed to complement Droid Sans. It was initialy designed by
+Steve Matteson of Ascender with consulting by Pascal Zoghbi of 29ArabicLetters
+to finalize the font family.
+
+%_font_pkg -n kufi -f ??-%{fontname}-kufi.conf DroidKufi*ttf
+
 %prep
 %setup -q -n %{archivename}
 
@@ -91,7 +111,6 @@ install -m 0755 -d %{buildroot}%{_fontdir}
 
 install -m 0644 -p $(ls *ttf | grep -v DroidSansFallbackFull\
                              | grep -v DroidSansFallbackLegacy\
-                             | grep -v DroidSansArabic\
                              | grep -v DroidNaskh-Regular-SystemUI) \
                     %{buildroot}%{_fontdir}
 
@@ -104,10 +123,13 @@ install -m 0644 -p %{SOURCE11} \
         %{buildroot}%{_fontconfig_templatedir}/60-%{fontname}-sans-mono.conf
 install -m 0644 -p %{SOURCE12} \
         %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-serif.conf
+install -m 0644 -p %{SOURCE13} \
+        %{buildroot}%{_fontconfig_templatedir}/65-%{fontname}-kufi.conf
 
 for fontconf in 65-%{fontname}-sans.conf \
                 60-%{fontname}-sans-mono.conf \
-                65-%{fontname}-serif.conf ; do
+                65-%{fontname}-serif.conf \
+                65-%{fontname}-kufi.conf ; do
   ln -s %{_fontconfig_templatedir}/$fontconf \
         %{buildroot}%{_fontconfig_confdir}/$fontconf
 done
@@ -118,6 +140,10 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Jul 16 2012 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20120715-3
+— Split Kufi in a separate subpackage and resurect DroidSansArabic for Sans
+
 * 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