From d439e3e03203f2fdc7c2c7aec0f1b71a004bf418 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Tue, 4 May 2010 23:24:36 +0100
Subject: [PATCH] mini: cleanup font inclusion/exclusions

---
 fedora-live-mini.ks   | 25 ++++++-------------------
 fedora-livecd-soas.ks |  5 +----
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index a1c4feb..1e2a2f6 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -28,10 +28,15 @@ repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?re
 @base
 @core
 @hardware-support
-@fonts
 kernel
 memtest86+
 
+# implicitly include the fonts we want
+liberation*
+google-droid*
+dejavu-sans*
+dejavu-serif
+
 # Remove default base packages we don't want
 -ccid
 -coolkey
@@ -96,24 +101,6 @@ memtest86+
 -irda-utils
 -fprintd*
 
-# Remove unwanted default fonts we don't want
--cjkuni-uming-fonts
--jomolhari-fonts
--kacst*
--khmeros-base-fonts
--lklug-fonts
--lohit*
--paktype*
--smc-meera-fonts
--stix-fonts
--thai-scalable-waree-fonts
--un-core-dotum-fonts
--vlgothic-fonts
--paratype-pt-sans-fonts
--sil-abyssinica-fonts
--sil-padauk-fonts
--wqy-zenhei-fonts
-
 # dictionaries are big
 -aspell-*
 -hunspell-*
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index fd3fe98..cc53b8b 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -91,10 +91,7 @@ libertas-usb8388-firmware
 # == Fonts ==
 # More font support according to:
 # http://bugs.sugarlabs.org/ticket/1119
-google-droid-fonts-common
-google-droid-sans-fonts
-google-droid-sans-mono-fonts
-google-droid-serif-fonts
+# Moved to mini.ks
 
 %end