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

fedora-install-fedora.ks

@@ -10,7 +10,7 @@
 #part iso --size=4998
 
 # Add the repos you wish to use to compose here.  At least one of them needs group data.
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4*
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4*
 repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --exclude kernel*debug* --exclude kernel-kdump* --exclude syslog-ng --exclude java-1.5.0-gcj-devel --exclude astronomy-bookmarks --exclude generic* --exclude java-1.5.0-gcj-javadoc --exclude btanks* --exclude GConf2-dbus* --exclude bluez-gnome --exclude xfce4-notifyd --exclude xfwm4*
 
 

fedora-live-kde.ks

@@ -28,7 +28,9 @@ koffice-filters
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
-#pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
+krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
 # only include kdegames-minimal
 -kdegames
@@ -44,13 +46,13 @@ yum-presto
 ### fixes and space issues
 
 # fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts	# a compact CJK font
+wqy-microhei-fonts	# a compact CJK font, to replace:
--un-core-dotum-fonts
+-un-core-dotum-fonts	# Korean
--vlgothic-fonts
+-vlgothic-fonts		# Japanese
--wqy-zenhei-fonts
+-wqy-zenhei-fonts	# Chinese
--paratype-pt-sans-fonts
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
-#-kacst*fonts*		# arabic
 
 # make sure alsaunmute is there
 alsa-utils

fedora-livecd-kde.ks

@@ -14,15 +14,14 @@
 %packages
 # unwanted packages from @kde-desktop
 # don't include these for now to fit on a cd
--amarok 			# amarok has duplicate functionality with juk (~13 megs)
 -desktop-backgrounds-basic
--digikam			# digikam has duplicate functionality with gwenview (~11 megs)
 -kdeaccessibility*
 -kdeedu*			# kdeedu is too big for the live images
 -scribus			# scribus is too big for the live images
--ktorrent			# kget has also basic torrent features (~3 megs)
--kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 -kdeartwork-screensavers	# screensavers are not needed on live images
+#-ktorrent			# kget has also basic torrent features (~3 megs)
+#-digikam			# digikam has duplicate functionality with gwenview (~28 megs)
+#-amarok 			# amarok has duplicate functionality with juk (~23 megs)
 #-kipi-plugins			# ~8 megs
 #-konq-plugins			# ~2 megs
 #-kdeplasma-addons		# ~16 megs
@@ -38,7 +37,8 @@ koffice-filters
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
-#pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
+#pavucontrol			# pavucontrol has duplicate functionality with kmix
+#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 
 # only include kdegames-minimal
 -kdegames
@@ -54,13 +54,13 @@ yum-presto
 ### fixes and space issues
 
 # fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts	# a compact CJK font
+wqy-microhei-fonts	# a compact CJK font, to replace:
--un-core-dotum-fonts
+-un-core-dotum-fonts	# Korean
--vlgothic-fonts
+-vlgothic-fonts		# Japanese
--wqy-zenhei-fonts
+-wqy-zenhei-fonts	# Chinese
--paratype-pt-sans-fonts
+
+-paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
-#-kacst*fonts*		# arabic
 
 # make sure alsaunmute is there
 alsa-utils

fedora-livecd-lxde.ks

@@ -10,63 +10,69 @@
 %include fedora-live-minimization.ks
 
 %packages
-# LXDE desktop
+### LXDE desktop
 @lxde-desktop
 lxlauncher
 obconf
 lxdm
 
-# internet
+### internet
 firefox
+java-1.6.0-openjdk-plugin
+pidgin
 sylpheed
-lostirc
 transmission
 
-# office
+### office
 abiword
 gnumeric
 osmo
-#glista
 
-# graphics
+### graphics
 epdfview
 mtpaint
 
-# audio & video
+### audio & video
-#gmixer
+alsa-plugins-pulseaudio
-pavucontrol
-lxmusic
 asunder
+lxmusic
 gxine
 gxine-mozplugin
-
+pavucontrol
 # I'm looking for something smaller than
 gnomebaker
 
-# utils
+### utils
 galculator
 parcellite
 xpad
 
-# system
+### system
 gigolo
 
-# more Desktop stuff
+### more desktop stuff
-hal-storage-addon
+# default artwork, subject to change - cwickert 2011-03-05
-alsa-plugins-pulseaudio
+gtk-theme-engine-clearlooks
-NetworkManager-gnome
+fedora-icon-theme
-java-1.6.0-openjdk-plugin
+
-xcompmgr
-xdg-user-dirs-gtk
-# needed for xdg-open to support LXDE
-perl-File-MimeInfo
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
+
 # needed for automatic unlocking of keyring (#643435)
 gnome-keyring-pam
 
-# make sure kpackagekit doesn't end up the LXDE live images
+hal-storage-addon
-gnome-packagekit*
+NetworkManager-gnome
+
+# needed for xdg-open to support LXDE
+perl-File-MimeInfo
+
+xcompmgr
+xdg-user-dirs-gtk
+
+# use yumex instead of gnome-packagekit
+yumex
+-gnome-packagekit
 -kpackagekit
 
 # LXDE has lxpolkit. Make sure no other authentication agents end up in the spin.
@@ -81,10 +87,6 @@ notification-daemon
 # https://bugzilla.redhat.com/show_bug.cgi?id=643416
 metacity
 
-# use yumex instead of gnome-packagekit
-#-gnome-packagekit
-#yumex
-
 # Command line
 powertop
 wget