From 231b7fc23b3007b784b7bac07d65e52cb241d49c Mon Sep 17 00:00:00 2001
From: nim <nim@fedoraproject.org>
Date: Sep 13 2009 13:41:26 +0000
Subject: fontconfig tweaks


---

diff --git a/.cvsignore b/.cvsignore
index ed7ea47..48e2097 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,9 +1,9 @@
 DroidSans-Bold.ttf
+DroidSans.ttf
 DroidSansFallback.ttf
+DroidSansJapanese.ttf
 DroidSansMono.ttf
 DroidSerif-Bold.ttf
 DroidSerif-BoldItalic.ttf
 DroidSerif-Italic.ttf
 DroidSerif-Regular.ttf
-DroidSans.ttf
-DroidSansJapanese.ttf
diff --git a/google-droid-fonts-sans-fontconfig.conf b/google-droid-fonts-sans-fontconfig.conf
index b12b700..305d289 100644
--- a/google-droid-fonts-sans-fontconfig.conf
+++ b/google-droid-fonts-sans-fontconfig.conf
@@ -1,18 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
-  <alias>
-    <family>sans-serif</family>
-    <prefer>
-      <family>Droid Sans</family>
-    </prefer>
-  </alias>
-  <alias>
-    <family>Droid Sans</family>
-    <default>
-      <family>sans-serif</family>
-    </default>
-  </alias>
   <match target="scan">
     <test name="family">
       <string>Droid Sans</string>
@@ -55,4 +43,16 @@
       <family>Droid Sans</family>
     </accept>
   </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Droid Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
 </fontconfig>
diff --git a/google-droid-fonts-sans-mono-fontconfig.conf b/google-droid-fonts-sans-mono-fontconfig.conf
index 4472ed2..1cf8bbc 100644
--- a/google-droid-fonts-sans-mono-fontconfig.conf
+++ b/google-droid-fonts-sans-mono-fontconfig.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
diff --git a/google-droid-fonts-serif-fontconfig.conf b/google-droid-fonts-serif-fontconfig.conf
index 7107973..f56b5ed 100644
--- a/google-droid-fonts-serif-fontconfig.conf
+++ b/google-droid-fonts-serif-fontconfig.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
   <alias>
diff --git a/google-droid-fonts.spec b/google-droid-fonts.spec
index 5369e6a..677f6bc 100644
--- a/google-droid-fonts.spec
+++ b/google-droid-fonts.spec
@@ -12,7 +12,7 @@ other screen text.
 Name:    %{fontname}-fonts
 # No sane versionning upstream, use the date we did a git dump
 Version: 20090906
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: General-purpose fonts released by Google as part of Android
 
 Group:     User Interface/X
@@ -139,6 +139,8 @@ rm -fr %{buildroot}
 
 %changelog
 * Sun Sep 13 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net>
+- 20090906-4
+— follow the fontpackages template more closely
 - 20090906-3
 — more Behdad-suggested fontconfig tweaks
 
diff --git a/import.log b/import.log
index 3b6d277..23f0958 100644
--- a/import.log
+++ b/import.log
@@ -7,3 +7,4 @@ google-droid-fonts-20090320-3_fc12:HEAD:google-droid-fonts-20090320-3.fc12.src.r
 google-droid-fonts-20090906-1_fc12:HEAD:google-droid-fonts-20090906-1.fc12.src.rpm:1252264176
 google-droid-fonts-20090906-2_fc12:HEAD:google-droid-fonts-20090906-2.fc12.src.rpm:1252351928
 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
diff --git a/sources b/sources
index 0d03927..be7b0a0 100644
--- a/sources
+++ b/sources
@@ -1,9 +1,9 @@
 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
-9d83fb20700a3a7c45dc9acd64ab121e  DroidSans.ttf
-6d7e0d083e3c5e1b504e580b4e2fe7db  DroidSansJapanese.ttf