only cleanups, no changes to package list

1 files changed, 34 insertions, 64 deletions

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 96631c2..1dfc068 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -11,6 +11,39 @@
 
 %packages
 
+### The KDE-Desktop
+
+@kde-desktop
+
+# 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)
+-digikam			# digikam has duplicate functionality with gwenview (~11 megs)
+-kdeedu*			# kdeedu is too big for the live images, but include kdeedu-kstars
+-scribus			# scribus is too big for the live images
+-ktorrent			# kget has also basic torrent features (~3 megs)
+#-kftpgrabber*			# konqueror is also able to browse ftp shares (~1 megs)
+-kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
+#-kdegames			# the removal of kdegames will free ~35 megs
+-kdeartwork-screensavers	# screensavers are not needed on live images
+-kipi-plugins			# ~8 megs
+#-konq-plugins			# ~2 megs
+#-kdeplasma-addons		# ~5 megs
+
+# Additional packages that are not default in kde-desktop but useful
+koffice-kword
+koffice-kspread			# ~1 megs
+koffice-kpresenter		# ~3 megs
+koffice-filters
+kdeartwork			# only include some parts of kdeartwork
+k3b
+filelight			# ~400kb
+#twinkle			# (~10 megs)
+fuse
+liveusb-creator
+#pavucontrol			# nice to have but pulls in gstreamer (~3 megs)
+
+
 ### fixes and space issues
 
 # make kpackagekit the default on the kde live images
@@ -21,9 +54,6 @@ kpackagekit
 -system-config-printer
 system-config-printer-kde
 
-# make sure /usr/bin/pactl is there (#466544)
-pulseaudio-utils
-
 # make sure alsaunmute is there
 alsa-utils
 
@@ -32,66 +62,6 @@ alsa-utils
 -m17n*
 -ibus*
 
-
-### The KDE-Desktop
-
-@kde-desktop
-
-# unwanted packages from @kde-desktop
-# don't include these for now to fit on a cd
-
-### amarok has duplicate functionality with juk (~13 megs)
--amarok
-### digikam has duplicate functionality with gwenview (~11 megs)
--digikam
-### kdeedu is too big for the live images, but include kdeedu-kstars
--kdeedu*
-### scribus is too big for the live images
--scribus
-### kget has also basic torrent features (~3 megs)
--ktorrent
-### konqueror is also able to browse ftp shares (~1 megs)
-#-kftpgrabber*
-### kaffeine has duplicate functionality with dragonplayer (~3 megs)
--kaffeine*
-### the removal of kdegames will free ~35 megs
-#-kdegames
-### only include some parts of kdeartwork
-kdeartwork
--kdeartwork-screensavers
-
-
-# some more
--kipi-plugins
-#-konq-plugins
-#-kdeplasma-addons
-
-
-# koffice
-koffice-kword
-koffice-kspread
-koffice-kpresenter
-koffice-filters
-
-
-# Useful additional KDE3 applications
-k3b
-filelight
-# twinkle (~10 megs)
-#twinkle
-
-# some extras
-fuse
-liveusb-creator
-
-# nice to have but pulls in gstreamer (~3 megs)
-#pavucontrol
-
-# FIXME/TODO: recheck the removals here
-# try to remove some packages from fedora-live-base.ks
--gdm
--authconfig-gtk
-
 # save some space (from @base)
 -make
 -nss_db
@@ -136,7 +106,7 @@ cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
 FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop,/usr/share/applications/liveinst.desktop
 MENU_EOF
 
-# show liveinst.desktop on and in menu
+# show liveinst.desktop on desktop and in menu
 sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 
 # Disable the update notifications of kpackagekit