Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts

This commit is contained in:
Peter Robinson 2010-05-03 13:18:05 +01:00
commit 87e9dfe929
5 changed files with 13 additions and 7 deletions

View File

@ -367,6 +367,10 @@ rm -f /boot/initramfs*
# make sure there aren't core files lying around # make sure there aren't core files lying around
rm -f /core* rm -f /core*
# convince readahead not to collect
rm -f /.readahead_collect
touch /var/lib/readahead/early.sorted
%end %end

View File

@ -109,6 +109,7 @@ memtest86+
-thai-scalable-waree-fonts -thai-scalable-waree-fonts
-un-core-dotum-fonts -un-core-dotum-fonts
-vlgothic-fonts -vlgothic-fonts
-wqy-zenhei-fonts
# dictionaries are big # dictionaries are big
-aspell-* -aspell-*

View File

@ -26,7 +26,6 @@ broffice.org-*
# Include some additional packages # Include some additional packages
@java @java
vino
brasero brasero
bitstream-vera-* bitstream-vera-*
gimp gimp
@ -35,6 +34,7 @@ inkscape
# We won't use these Asian fonts # We won't use these Asian fonts
-lklug-fonts -lklug-fonts
-sil-abyssinica-fonts -sil-abyssinica-fonts
-sil-padauk-fonts
-jomolhari-fonts -jomolhari-fonts
-lohit-* -lohit-*
-baekmuk-* -baekmuk-*

View File

@ -23,7 +23,6 @@ nautilus
# graphics # graphics
agave agave
blender blender
# capa
cinepaint cinepaint
entangle entangle
fontforge fontforge
@ -38,7 +37,7 @@ mypaint
nautilus-image-converter nautilus-image-converter
optipng optipng
# pinta # pinta
postr # postr
rawtherapee rawtherapee
scribus scribus
shotwell shotwell
@ -71,10 +70,6 @@ gedit
gnome-utils gnome-utils
gtk-recordmydesktop gtk-recordmydesktop
# lets save space
-wqy-zenhei-fonts
-ibus-pinyin-open-phrase
%end %end
%post %post

View File

@ -55,6 +55,12 @@ system-config-printer-kde
# use yum-presto by default # use yum-presto by default
yum-presto yum-presto
# fonts (we make no bones about admitting we're english-only)
# CJK, use compact wqy-microhei-fonts , omit bigger stuff
wqy-microhei-fonts
-un-core-dotum-fonts
-vlgothic-fonts
-wqy-zenhei-fonts
### fixes and space issues ### fixes and space issues