Bump version/release

bolzplatz2006, clonekeen, rott-shareware and vavoom are only playable with
downloads which doesn't work very well with a live DVD.
quake3 is playable with openarena, but currently that isn't included because
of size. If that changes, including openarena will bring it in without
a specific mention, so it should still come off the list.

Makefile.am

@@ -5,15 +5,15 @@ kickstart_DATA = \
     fedora-aos.ks \
     fedora-install-fedora.ks \
     fedora-live-base.ks \
+    fedora-livecd-broffice.org.ks \
     fedora-livecd-desktop.ks \
-    fedora-livecd-desktop-default.ks \
     fedora-livecd-desktop-de_CH.ks \
     fedora-livecd-desktop-de_DE.ks \
     fedora-livecd-desktop-en_US.ks \
     fedora-livecd-desktop-nl_NL.ks \
     fedora-livecd-desktop-pt_BR.ks \
     fedora-livecd-desktop-pt_PT.ks \
-    fedora-livecd-education-math.ks \
+    fedora-livecd-education.ks \
     fedora-livecd-kde.ks \
     fedora-livecd-kde-de_CH.ks \
     fedora-livecd-kde-de_DE.ks \
@@ -23,10 +23,6 @@ kickstart_DATA = \
     fedora-livecd-xfce-de_CH.ks \
     fedora-livecd-xfce-nl_NL.ks \
     fedora-livecd-xfce-pt_PT.ks \
-    fedora-livedvd-developer.ks \
-    fedora-livedvd-developer-de_CH.ks \
-    fedora-livedvd-developer-nl_NL.ks \
-    fedora-livedvd-developer-pt_PT.ks \
     fedora-livedvd-electronic-lab.ks \
     fedora-livedvd-electronic-lab-de_CH.ks \
     fedora-livedvd-electronic-lab-nl_NL.ks \

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.10.4)
+AC_INIT([spin-kickstarts], 0.11.2)
 AC_SUBST([RELEASE], 1)
 
 ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it ja ko ml ms nb nl or pa pl pt pt_BR ru sk sl sr@latin sr sv ta tr uk zh_CN zh_TW"

fedora-aos.ks

@@ -27,12 +27,12 @@ part / --size 550 --fstype ext3 --ondisk sda
 # Repositories
 #
 # To compose against the current release tree, use the following "repo" (enabled by default)
-repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
+#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
+#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
 
 # To compose against rawhide, use the following "repo" (disabled by default)
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 # To compose against local trees, (edit and) use:
 #repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/

fedora-install-fedora.ks

@@ -40,6 +40,7 @@ joe
 emacs
 k3b
 @system-tools
+mc
 wireshark-gnome
 # Devel packages
 @development-libs

fedora-live-base.ks

@@ -14,16 +14,16 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled
 xconfig --startxonboot
-part / --size 3072
+part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 # To compose against the current release tree, use the following "repo" (enabled by default)
-repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
+#repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
+#repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
 
 # To compose against rawhide, use the following "repo" (disabled by default)
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 # To compose against local trees, (edit and) use:
 #repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
@@ -34,6 +34,7 @@ repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 @base
 @core
 @fonts
+@input-methods
 @admin-tools
 @dial-up
 @hardware-support
@@ -250,6 +251,8 @@ if strstr "\`cat /proc/cmdline\`" CDLABEL= ; then
 cat /sbin/halt > /dev/null
 cat /sbin/reboot > /dev/null
 /usr/sbin/eject -p -m \$(readlink -f /dev/live) >/dev/null 2>&1
+echo "Please remove the CD from your drive and press Enter to finish restarting"
+read -t 30 < /dev/console
 FOE
 chmod +x /sbin/halt.local
 fi

fedora-livecd-broffice.org.ks

@@ -1,7 +1,10 @@
 # fedora-livecd-broffice.ks
 #
-# Maintainer(s):
-# - Igor Pires Soares <igor at projetofedora.org>
+# Description:
+# - Provides the legal brand "BrOffice.org" for OpenOffice.org in Brazil
+#
+# Maintainer:
+# - Igor Pires Soares <igor at fedoraproject.org>
 
 
 %include fedora-livecd-desktop.ks
@@ -10,58 +13,55 @@ lang pt_BR.UTF-8
 keyboard br-abnt2
 timezone America/Sao_Paulo
 
-%packages
+
+%packages --instLangs en_US:pt_BR
+
+# L10n packages
 @brazilian-support
 hunspell-pt
 
-
-# To avoid double functionality we will drop abiword and gnumeric and put BrOffice.org in
+# To avoid double functionality we will drop abiword and gnumeric and include BrOffice.org
 -abiword
 -gnumeric
--gimp-*
-broffice.org-writer
-broffice.org-calc
-broffice.org-impress
-broffice.org-draw
+-planner
+broffice.org-*
 
+# Include some desktop packages
+@java
+totem-xine
+vino
+gnome-games
+system-config-display
+brasero
+bitstream-vera-*
 
-# We won't use these Asian fonts anyway
+# We won't use these Asian fonts
 -lklug-fonts
 -abyssinica-fonts
 -jomolhari-fonts
 -lohit-fonts-*
--thaifonts-scalable
 -kacst-fonts
 -paktype-fonts
 -baekmuk-*
--cjkunifonts-*
--VLGothic-fonts
+-VLGothic-fonts-*
 -padauk-fonts
--khmeros-fonts-base
--un-core-fonts-*
--smc-fonts-meera
+-un-*
+-samyak-fonts-*
+-sarai-fonts
+-stix-fonts
+-cjkuni-*
+-hanazono-fonts
+-thai-*
 
-# Assure we won't get these Asian input methods
--libchewing
+# remove input methods
+-@input-methods
+-m17n*
+-scim*
+-iok
 -anthy
 -kasumi
--scim-chewing
--scim-pinyin
-
-# Saving space in order to get BrOffice.org in
--gnome-utils
--gnome-games-*
--gnome-doc-utils-stylesheets
--gnome-phone-manager
--planner
--scim-python*
--dasher
--system-config-language
--evince-dvi
--evince-djvu
--ekiga
--f-spot
--cheese
+-libchewing
+-ibus-*
 
 %end
 

fedora-livecd-desktop-de_CH.ks

@@ -12,6 +12,9 @@ timezone Europe/Zurich
 %packages
 -gnome-blog
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post

fedora-livecd-desktop-de_DE.ks

@@ -12,6 +12,9 @@ timezone Europe/Berlin
 %packages
 -gnome-blog
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post

fedora-livecd-desktop-default.ks

@@ -1,117 +0,0 @@
-# fedora-livecd-desktop-default.ks
-#
-# Includes all languages with a default of en_US locale settings
-#
-
-%include fedora-livecd-desktop.ks
-
-lang en_US.UTF-8
-keyboard us
-timezone US/Eastern
-
-%packages
-@albanian-support
-@arabic-support
-@assamese-support
-@basque-support
-@belarusian-support
-@bengali-support
-@brazilian-support
-@british-support
-@bulgarian-support
-@catalan-support
-@chinese-support
-@czech-support
-@danish-support
-@dutch-support
-@estonian-support
-@finnish-support
-@french-support
-@galician-support
-@georgian-support
-@german-support
-@greek-support
-@gujarati-support
-@hebrew-support
-@hindi-support
-@hungarian-support
-@indonesian-support
-@italian-support
-@japanese-support
-@kannada-support
-@korean-support
-@latvian-support
-@lithuanian-support
-@macedonian-support
-@malayalam-support
-@marathi-support
-@nepali-support
-@norwegian-support
-@oriya-support
-@persian-support
-@polish-support
-@portuguese-support
-@punjabi-support
-@romanian-support
-@russian-support
-@serbian-support
-@slovak-support
-@slovenian-support
-@spanish-support
-@swedish-support
-@tamil-support
-@telugu-support
-@thai-support
-@turkish-support
-@ukrainian-support
-@vietnamese-support
-@welsh-support
-
-# The following locales have less than 50% translation coverage for the core
-# GNOME stack, as found at http://l10n.gnome.org/languages/
-
-#@afrikaans-support
-#@armenian-support
-#@bhutanese-support
-#@bosnian-support
-#@breton-support
-#@croatian-support
-#@esperanto-support
-#@ethiopic-support
-#@faeroese-support
-#@filipino-support
-#@gaelic-support
-#@icelandic-support
-#@inuktitut-support
-#@irish-support
-#@khmer-support
-#@lao-support
-#@low-saxon-support
-#@malay-support
-#@maori-support
-#@mongolian-support
-#@northern-sami-support
-#@northern-sotho-support
-#@samoan-support
-#@sinhala-support
-#@somali-support
-#@southern-ndebele-support
-#@southern-sotho-support
-#@swati-support
-#@tagalog-support
-#@tibetan-support
-#@tonga-support
-#@tsonga-support
-#@tswana-support
-#@urdu-support
-#@venda-support
-#@walloon-support
-#@xhosa-support
-#@zulu-support
-
-# These fonts are only used in the commented-out locales above
--lklug-fonts
--abyssinica-fonts
--jomolhari-fonts
-
-%end

fedora-livecd-desktop-en_US.ks

@@ -9,3 +9,8 @@ lang en_US.UTF-8
 keyboard us
 timezone US/Eastern
 
+%packages
+# exclude input methods
+-m17n*
+-scim*
+%end

fedora-livecd-desktop-nl_NL.ks

@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-desktop-pt_BR.ks

@@ -11,6 +11,9 @@ timezone America/Sao_Paulo
 
 %packages
 @brazilian-support
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post

fedora-livecd-desktop-pt_PT.ks

@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-desktop.ks

@@ -11,8 +11,6 @@
 @sound-and-video
 @gnome-desktop
 nss-mdns
-NetworkManager-vpnc
-NetworkManager-openvpn
 # we don't include @office so that we don't get OOo.  but some nice bits
 abiword
 #gnumeric
@@ -27,17 +25,8 @@ festvox-slt-arctic-hts
 -aspell-*
 -hunspell-*
 -man-pages-*
--scim-tables-*
--wqy-bitmap-fonts
--dejavu-fonts-experimental
 -words
 
-# more fun with space saving
--scim-lang-chinese
--scim-python*
-scim-chewing
-scim-pinyin
-
 # save some space
 -gnome-user-docs
 -gimp-help
@@ -60,9 +49,6 @@ totem-gstreamer
 -ekiga
 -tomboy
 -f-spot
-
-# hack to deal with conditionals + multiarch blargh
--scim-bridge-gtk.i386
 %end
 
 %post

fedora-livecd-education-math.ks

@@ -1,149 +0,0 @@
-# Fedora Education Math
-#
-# Filename:
-#   fedora-livecd-education-math.ks
-# Description:
-#   Fedora Live Spin including mainly software for educational & mathematical purposes
-# Maintainers:
-#   Sebastian Dziallas <sdz AT fedoraproject DOT org>
-#   Fedora Education SIG
-# Acknowledgements:
-#   Rex Dieter
-#   Thorsten Leemhuis
-
-%include fedora-live-base.ks
-
-%packages
-
-# KDE packages
-desktop-backgrounds-basic
-guidance-power-manager
-kdebase
-kdegraphics
-kdemultimedia
-kdeutils
-# koffice-kpresenter
-# koffice-kspread
-# koffice-kword
-kde-settings-pulseaudio
-NetworkManager-gnome
-
-# additional office packages
-# koffice pulls in kdelibs3
-abiword
-gnumeric
-
-# mathematical apps selected by the SIG
-kdeedu-math
-qalculate-gtk
-wxMaxima
-octave
-gnuplot
-Macaulay2
-orpie
-
-# some extras
-fuse
-# pavucontrol
-
-# additional fonts
-# @fonts
-# fonts-ISO8859-2 
-# cjkunifonts-ukai 
-# madan-fonts 
-# fonts-KOI8-R 
-# fonts-KOI8-R-100dpi 
-# tibetan-machine-uni-fonts
--abyssinica-fonts
--cjkunifonts-uming
--baekmuk-ttf-fonts-gulim
--dejavu-fonts-experimental
--jomolhari-fonts
--kacst-fonts
--paktype-fonts
--lklug-fonts
--lohit-fonts-*
--thaifonts-scalable
--VLGothic-fonts
-
-# FIXME/TODO: recheck the removals here
-# try to remove some packages from livecd-fedora-base-desktop.ks
--scim*
--gdm
--authconfig-gtk
--m17n*
--PolicyKit-gnome
--gnome-doc-utils-stylesheets
--anthy
--kasumi
--pygtkglext
--python-devel
--libchewing
-
-# save some space (from @base)
--make
--nss_db
--autofs
-
-# -@dial-up
--isdn4k-utils
--lrzsz
--rp-pppoe
--minicom
--wvdial
-
-# misc
--comps-extras
--gutenprint
--gutenprint-foomatic
--jwhois
--rdist
--rdate
-
-%end
-
-%post
-
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF
-
-# add initscript
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
-    # use image also for kdm
-    mkdir -p /usr/share/apps/kdm/faces
-    cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
-fi
-
-# make fedora user use KDE
-echo "startkde" > /home/liveuser/.xsession
-chmod a+x /home/liveuser/.xsession
-chown liveuser:liveuser /home/liveuser/.xsession
-
-# set up autologin for user fedora
-sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
-
-# set up user fedora as default user and preselected user
-sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
-
-# add apps to favorites menu
-mkdir -p /home/liveuser/.kde/share/config/
-cat > /home/liveuser/.kde/share/config/kickoffrc << MENU_EOF
-[Favorites]
-FavoriteURLs=/usr/share/applications/kde4/konqbrowser.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/liveinst.desktop
-MENU_EOF
-chown -R liveuser:liveuser /home/liveuser/.kde/
-
-# show liveinst.desktop on and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-
-# workaround to start nm-applet automatically
-cp /etc/xdg/autostart/nm-applet.desktop /usr/share/autostart/
-
-%end

fedora-livecd-education.ks

@@ -0,0 +1,106 @@
+# fedora-livecd-education.ks
+#
+# Description:
+# - Fedora Live Spin including mainly software for educational purposes
+#
+# Maintainers:
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Fedora Education SIG
+
+%include fedora-live-base.ks
+
+# please don't forget to adjust the instLangs argument
+# if you are going to create a localized spin
+%packages --excludedocs --instLangs en_US
+
+# desktop environments
+@sugar-desktop
+@xfce-desktop
+
+# education
+avogadro
+kdeedu
+
+# internet
+alpine
+empathy
+firefox
+
+# office
+abiword
+gnumeric
+evince
+
+# graphics
+blender
+inkscape
+gimp
+mirage
+
+# audio & video
+totem
+totem-gstreamer
+totem-mozplugin
+-totem-xine
+-xine-lib
+
+# others
+geany
+gnash-plugin
+
+# system
+alsa-plugins-pulseaudio
+desktop-backgrounds-compat
+gnome-power-manager
+liveusb-creator
+NetworkManager-gnome
+pavucontrol
+setroubleshoot
+xdg-user-dirs
+
+# remove imsettings-xfce for now until it gets re-written
+-imsettings-xfce
+
+# dictionaries are big
+-aspell-*
+-hunspell-*
+-man-pages-*
+-words
+
+# exclude input methods
+-scim*
+-m17n*
+
+# save some space
+-autofs
+-nss_db
+-sendmail
+ssmtp
+-acpid
+-isdn4k-utils
+-gimp-help
+-gimp-help-browser
+
+%post
+
+# create /etc/sysconfig/desktop (needed for installation)
+cat > /etc/sysconfig/desktop <<EOF
+PREFERRED=/usr/bin/startxfce4
+EOF
+
+cat >> /etc/rc.d/init.d/livesys << EOF
+chown -R liveuser:liveuser /home/liveuser
+
+# disable screensaver locking
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+# set up timed auto-login for after 60 seconds
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+TimedLoginEnable=true
+TimedLogin=liveuser
+TimedLoginDelay=60
+FOE
+
+EOF
+
+%end

fedora-livecd-kde-de_CH.ks

@@ -11,7 +11,9 @@ timezone Europe/Zurich
 
 %packages
 @german-support
-
+# exclude input methods
+-m17n*
+-scim*
 %end
 
 %post

fedora-livecd-kde-de_DE.ks

@@ -23,11 +23,12 @@ gnome-packagekit
 
 # don't install unnecessary fonts
 -abyssinica-fonts
--cjkunifonts-uming
+-cjkuni*fonts*
 -jomolhari-fonts
 -kacst-fonts
 -khmeros-fonts-base
 -lklug-fonts
+-lohit-fonts*
 -un-core-fonts-dotum
 -padauk-fonts
 -paktype-fonts
@@ -36,6 +37,9 @@ gnome-packagekit
 -thaifonts-scalable
 -VLGothic-fonts
 
+# remove kdegames to free needed space
+-kdegames*
+
 %end
 
 %post

fedora-livecd-kde-nl_NL.ks

@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-kde-pt_PT.ks

@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-kde.ks

@@ -11,68 +11,79 @@
 
 %packages
 
+### fixes and space issues
+
 # make kpackagekit the default on the kde live images
 kpackagekit
 -gnome-packagekit
 
+# use system-config-printer-kde instead of system-config-printer
+-system-config-printer
+system-config-printer-kde
+
 # make sure /usr/bin/pactl is there (#466544)
 pulseaudio-utils
 
+# make sure alsaunmute is there
+alsa-utils
+
+# remove input methods to free space
+-scim*
+-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 (~10 megs)
+### amarok has duplicate functionality with juk (~13 megs)
 #-amarok
 ### digikam has duplicate functionality with gwenview (~11 megs)
-#-digikam
+-digikam
 ### kdeedu is too big for the live images, but include kdeedu-kstars
--kdeedu
-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*
+-kftpgrabber*
 ### kaffeine has duplicate functionality with dragonplayer (~3 megs)
 -kaffeine*
-### the removal of kdegames will free ~31 megs
+### the removal of kdegames will free ~35 megs
 #-kdegames
+### kdeartwork is not really needed
+-kdeartwork
+
+# some more
+-kipi-plugins
+#-konq-plugins
+-kdeplasma-addons
 
 
-# Useful additional KDE3 applications
+# koffice
 koffice-kword
 koffice-kspread
 koffice-kpresenter
 koffice-filters
+
+
+# Useful additional KDE3 applications
 k3b
 filelight
 # twinkle (~10 megs)
-twinkle
-
+#twinkle
 
 # some extras
 fuse
 liveusb-creator
+
 # nice to have but pulls in gstreamer (~3 megs)
-pavucontrol
-konq-plugins
-kde-plasma-lancelot
-# make sure alsaunmute is there
-alsa-utils
-
-
-# additional fonts
-@fonts
-#fonts-ISO8859-2 
-#cjkunifonts-ukai 
-#madan-fonts 
-#fonts-KOI8-R 
-#fonts-KOI8-R-100dpi 
-#tibetan-machine-uni-fonts
-
+#pavucontrol
 
 # FIXME/TODO: recheck the removals here
 # try to remove some packages from fedora-live-base.ks

fedora-livecd-xfce-de_CH.ks

@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-xfce-nl_NL.ks

@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-xfce-pt_PT.ks

@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livecd-xfce.ks

@@ -12,13 +12,10 @@
 
 %packages
 
-# gdm depends on gnome-session but lacks a dependency. Temporary workaround
-
-gnome-session
+# remove imsettings-xfce for now until it gets re-written
+-imsettings-xfce
 
 firefox
-NetworkManager-vpnc
-NetworkManager-openvpn
 NetworkManager-gnome
 NetworkManager-pptp
 
@@ -53,7 +50,6 @@ pidgin
 claws-mail
 # brasero has more dependencies
 gnomebaker
-drivel
 liferea
 quodlibet
 gftp
@@ -113,12 +109,8 @@ xfwm4-themes
 # dictionaries are big
 #-aspell-*
 #-man-pages-*
-#-scim-tables-*
 
 # more fun with space saving
-#-scim-lang-chinese
-#scim-chewing
-#scim-pinyin
 -gimp-help
 
 
@@ -142,6 +134,18 @@ cat > /etc/sysconfig/desktop <<EOF
 PREFERRED=/usr/bin/startxfce4
 EOF
 
+mkdir -p /home/liveuser/.config/xfce4
+
+cat > /home/liveuser/.config/xfce4/helpers.rc <<EOF
+MailReader=sylpheed-claws
+EOF
+
+mkdir -p /root/.config/xfce4
+
+cat > /root/.config/xfce4/helpers.rc <<EOF
+MailReader=sylpheed-claws
+EOF
+
 mkdir -p /home/liveuser/.config/tracker
 
 cat > /home/liveuser/.config/tracker/tracker.cfg <<EOF
@@ -172,13 +176,5 @@ FOE
 
 EOF
 
-
-%post
-
-# remove this session file from gnome-session package to make xfce the default
-# temporary hack till this file is split up from the package
-
-rm -rf /usr/share/xsessions/gnome.desktop
-
 %end
 

fedora-livedvd-developer-de_CH.ks

@@ -1,25 +0,0 @@
-# fedora-livedvd-developer-de_CH.ks
-#
-# Maintainer(s):
-# - Fabian Affolter  <fab a fedoraproject.org>
-
-%include fedora-livedvd-developer.ks
-
-lang de_DE
-keyboard sg-latin1
-timezone Europe/Zurich
-
-%packages
-@german-support
-%end
-
-%post
-# system-config-keyboard doesn't really work (missing xorg.conf etc)
-cat >>/etc/X11/xorg.conf << EOF
-Section "InputDevice"
-    Identifier "Keyboard0"
-    Option	    "XkbLayout" "ch"
-    Option	    "XkbVariant" "de_nodeadkeys"
-EndSection
-EOF
-%end

fedora-livedvd-developer-nl_NL.ks

@@ -1,14 +0,0 @@
-# fedora-livedvd-developer-nl_NL.ks
-#
-# Maintainer(s):
-# - Jeroen van Meeuwen <kanarip a fedoraunity.org>
-
-%include fedora-livedvd-developer.ks
-
-lang nl_NL
-keyboard us
-timezone Europe/Amsterdam
-
-%packages
-@dutch-support
-%end

fedora-livedvd-developer-pt_PT.ks

@@ -1,14 +0,0 @@
-# fedora-livedvd-developer-pt_PT.ks
-#
-# Maintainer(s):
-# - Pedro Silva <pedrofsilva a netcabo.pt>
-
-%include fedora-livedvd-developer.ks
-
-lang pt_PT.UTF-8
-keyboard pt-latin1
-timezone Europe/Lisbon
-
-%packages
-@portuguese-support
-%end

fedora-livedvd-developer.ks

@@ -1,115 +0,0 @@
-%include fedora-live-base.ks
-
-part / --size 6000
-
-%packages
-# Libraries
-@development-libs
-@gnome-software-development
-@java-development
-
-# SCM tools
-bazaar
-bzr
-cogito
-cvs2cl
-cvsutils
-git
-mercurial
-monotone
-quilt
-
-# IDEs
-@eclipse
-anjuta
-anjuta-docs
-codeblocks
-pida
-
-# General developer tools
-@authoring-and-publishing
-@development-tools
-@editors
-@system-tools
-@virtualization
-ElectricFence
-alleyoop
-crash
-dejagnu
-dogtail
-elfutils-devel
-emacs
-emacs-el
-expect
-frysk-gnome
-gconf-editor
-gettext-devel
-gnuplot
-hexedit
-inkscape
-intltool
-lynx
-maven2
-mutt
-scons
-sharutils
-socat
-sox
-tcp_wrappers-devel
-tcsh
-texi2html
-xchat
-
-# RPM/Fedora-specific tools
-@buildsys-build
-createrepo
-koji
-livecd-tools
-mock
-rpmdevtools
-rpmlint
-
-eclipse-demos
-
-# Should we?
-#@sql-server
-#@mysql
-#@ruby
-#@web-development
-#@x-software-development
-# I think this is going to be too big on x86_64
-#*-devel
-%end
-
-%post
-# Enable debuginfo repository (useful for frysk, gdb, etc.)
-awk '
-BEGIN {
-  debuginfo = 0
-}
-  /^\[.*\]/ {
-  if (/debuginfo/) {
-    debuginfo = 1
-  } else {
-    debuginfo = 0
-  }
-  print
-  next
-}
-  /enabled=0/ && debuginfo {
-  print "enabled=1"
-  next
-}
-{
-  print
-  next
-}' < /etc/yum.repos.d/fedora.repo > /etc/yum.repos.d/fedora.repo.tmp
-mv /etc/yum.repos.d/fedora.repo{.tmp,}
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-# Put link to demonstration videos on the desktop
-pushd /home/liveuser/Desktop
-ln -s /usr/share/eclipse-demos-0.0.1 "Eclipse demonstration videos"
-popd
-EOF
-%end

fedora-livedvd-electronic-lab-de_CH.ks

@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-electronic-lab-nl_NL.ks

@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-electronic-lab-pt_PT.ks

@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-electronic-lab.ks

@@ -69,6 +69,7 @@ tkcvs
 
 # vlsi
 alliance-doc
+electric
 irsim
 gds2pov
 magic-doc
@@ -91,11 +92,13 @@ drawtiming
 ghdl
 freehdl
 
-# spice
+# spice and circuit
 ngspice
 gnucap
 gspiceui
 gwave
+linsmith
+
 
 # PCB and schematics
 geda-gschem
@@ -115,6 +118,7 @@ piklab
 ktechlab
 pikloops
 sdcc
+gsim85
 
 # Serial Port Terminals
 gtkterm
@@ -153,6 +157,15 @@ xorg-x11-fonts-ISO8859-1-100dpi
 xorg-x11-fonts-ISO8859-9-100dpi
 xorg-x11-fonts-Type1
 
+# Perl Modules
+perl-Hardware-Verilog-Parser
+perl-Hardware-Vhdl-Lexer
+perl-Hardware-Vhdl-Parser
+perl-Hardware-Vhdl-Tidy
+perl-ModelSim-List
+perl-Perlilog
+perl-Verilog
+vhd2vl
 
 %end
 

fedora-livedvd-games-de_CH.ks

@@ -11,4 +11,7 @@ timezone Europe/Zurich
 
 %packages
 @german-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-games-nl_NL.ks

@@ -11,4 +11,7 @@ timezone Europe/Amsterdam
 
 %packages
 @dutch-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-games-pt_PT.ks

@@ -11,4 +11,7 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
+# exclude input methods
+-m17n*
+-scim*
 %end

fedora-livedvd-games.ks

@@ -1,15 +1,20 @@
 # fedora-livedvd-games.ks
 #
 # Maintainer(s):
-# - Rahul Sundaram <sundaram a fedoraunity.org>
+# - Bruno Wolff III <bruno@wolff.to>
+# - Formerly maintained by Rahul Sundaram
 
-%include fedora-live-base.ks
-part / --size 8000
+%include fedora-livecd-desktop.ks
+
+# The recommended part size for DVDs is too close to use for the games spin
+part / --size 10240
 
 %packages
 
-# Include a desktop environment (#474775)
-@gnome-desktop
+# Wine pulls in i386 libraries under x86_86 making that spin too big.
+# Also the point is to show off Fedora games, not running windows games.
+
+-wine
 
 # games
 
@@ -25,7 +30,6 @@ beneath-a-steel-sky-cd
 blobAndConquer
 boswars
 bzflag
-#croquet (pending)
 crossfire-client
 egoboo
 extremetuxracer
@@ -48,7 +52,7 @@ netpanzer
 neverball
 nexuiz
 nogravity
-openarena
+# openarena (cut because of size, may be restored later if larger iso's allowed)
 pinball
 scorched3d
 supertux
@@ -56,7 +60,6 @@ supertuxkart
 torcs
 tremulous
 ultimatestunts
-vdrift
 warzone2100
 wesnoth
 widelands
@@ -70,12 +73,9 @@ abe
 alex4
 ballz
 blobwars
-bolzplatz2006
 bombardier
-bsd-games
 cdogs-sdl
 clanbomber
-clonekeen
 foobillard
 glaxium
 gnubg
@@ -91,21 +91,16 @@ nethack
 openlierox
 pachi
 pioneers
-quake3
-quake3-demo
 quarry
 Ri-li
 rogue
-rott-shareware
 scorchwentbonkers
 seahorse-adventures
 solarwolf
 sopwith
-starfighter
 stormbaancoureur
 ularn
 urbanterror
-vavoom
 worldofpadman
 xblast
 
@@ -120,9 +115,6 @@ raidem
 raidem-music
 trackballs
 trackballs-music
-uqm
-uqm-content-3domusic
-uqm-content-voice
 
 # arcade classics(ish) (small)
 
@@ -138,7 +130,6 @@ seahorse-adventures
 shippy
 tecnoballz
 wordwarvi
-#(xgalaga renamed)
 xgalaxy
 zasx
 
@@ -185,15 +176,10 @@ tuxpaint-stamps
 tuxtype2
 
 # kde based games
-ksirk
-poker2d-kde
 taxipilot
 
 # utilities
 
-dosbox
 games-menus
-wget
 
 %end
-

snippets/eeepc900-modifications.ks

@@ -0,0 +1,164 @@
+###### Eee PC 900 stuff ####################################################
+#
+###### Hotkeys #############################################################
+cat > /etc/acpi/actions/hotkeys.sh << EOHOTKEY
+#!/bin/bash
+
+export DISPLAY=:0
+
+case "$3" in
+
+    #Fn+F2
+    00000010)
+        # Wlan On
+        /etc/acpi/actions/wlan.sh poweron
+        ;;
+    00000011)
+        # Wlan Off
+        /etc/acpi/actions/wlan.sh poweroff
+        ;;
+
+    #Fn+F6
+    00000012)
+        # Webcam switch
+        /etc/acpi/actions/camera.sh
+        # TaskManager
+	# /usr/bin/gnome-system-monitor
+	;;
+
+    #Fn+F7
+    00000013)
+        # Volume mute
+	/usr/bin/amixer set -D hw:0 Master toggle
+	;;
+
+    #Fn+F8
+    00000014)
+        # Volume down
+        /usr/bin/amixer set -D hw:0 Master 10%- unmute
+        ;;
+
+    #Fn+F9
+    00000015)
+        # Volume up
+        /usr/bin/amixer set -D hw:0 Master 10%+ unmute
+        ;;
+
+    #Fn+F5
+    00000030)
+
+	/usr/bin/xrandr --output VGA  --mode 1024x768 \
+			--output LVDS --off
+
+	if [[ "$?" != "0" ]]; then
+
+	/usr/bin/xrandr --output VGA  --preferred \
+			--output LVDS --off
+
+	fi
+	;;
+
+    00000031)
+
+	/usr/bin/xrandr --output LVDS --mode 800x480 \
+		        --output VGA  --mode 800x600
+
+        ;;
+    
+    00000032)
+
+	/usr/bin/xrandr --output VGA  --off       \
+           		--output LVDS --preferred
+
+        ;;
+    *)
+        logger "ACPI hotkey $3 action is not defined"
+        ;;
+esac
+EOHOTKEY
+
+###### WLAN #############################################################
+cat > /etc/acpi/actions/wlan.sh << EOF
+#!/bin/bash
+
+PWR=$(cat /sys/devices/platform/eeepc/wlan)
+
+UnloadModules() {
+    rmmod ath_pci
+    rmmod ath_rate_sample
+    rmmod wlan_scan_sta
+    rmmod wlan_tkip
+    rmmod wlan_wep
+    rmmod wlan
+}
+
+LoadModules() {
+    modprobe ath_pci
+}
+
+case $1 in
+    poweron)
+        if [[ "$PWR" = "0" ]]; then
+            modprobe pciehp pciehp_force=1
+
+	    echo 1 > /sys/devices/platform/eeepc/wlan
+
+	    rmmod pciehp
+
+        fi
+        ;;
+           
+    poweroff)
+        if [[ "$PWR" = "1" ]]; then
+
+            modprobe pciehp pciehp_force=1
+
+            ifconfig ath0 down
+
+            wlanconfig ath0 destroy
+
+            UnloadModules
+
+            echo 0 > /sys/devices/platform/eeepc/wlan
+
+            rmmod pciehp
+
+        fi
+        ;;
+esac
+EOF
+
+###### Webcam #############################################################
+cat > /etc/acpi/actions/camera.sh << EOF
+
+#!/bin/bash
+
+CAMERA=$(cat /sys/devices/platform/eeepc/camera)
+
+        if [[ "$CAMERA" = "0" ]]; then
+   	    echo 1 > /sys/devices/platform/eeepc/camera
+         else
+            echo 0 > /sys/devices/platform/eeepc/camera
+        fi
+EOF
+
+chmod +x "/etc/acpi/actions/*"
+
+###### Shutdown fix #########################################################
+echo "modprobe -r snd-hda-intel" >> /sbin/halt.local
+chmod 755 /sbin/halt.local
+
+###### Gnome display stuff ##################################################
+
+gconftool-2 --set /apps/nautilus/preferences/desktop_font --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/document_font_name --type string "Sans 8"
+gconftool-2 --set /desktop/gnome/interface/font_name --type string "Sans 8"
+gconftool-2 --set /apps/metacity/general/titlebar_font --type string "Sans Bold 8"
+gconftool-2 --set /desktop/gnome/interface/monospace_font_name --type string "Monospace 8"
+gconftool-2 --set /apps/metacity/window_keybindings/toggle_fullscreen --type string "<Alt>F11"
+gconftool-2 --set /desktop/gnome/interface/toolbar_style --type string "icons"
+gconftool-2 --set /desktop/gnome/sound/default_mixer_tracks --type list --list-type string "[PCM]"
+gconftool-2 --set /apps/gnome-power-manager/notify/low_capacity --type bool 0
+gconftool-2 --set /apps/compiz/plugins/move/allscreens/options/constrain_y --type bool 0
+gconftool-2 --set /apps/panel/toplevels/top_panel_screen0/size --type integer 19
+gconftool-2 --set /apps/panel/toplevels/bottom_panel_screen0/size --type integer 19

spin-kickstarts.spec.in

@@ -34,9 +34,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
-- Add de_CH localized spins
+- Removed developer spin from the mix
 
-* Tue Feb 24 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.4-1
+* Wed Mar 04 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.1-1
+- Added de_CH localized spins
+
+* Tue Feb 23 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.0-2
+- Remove fedora-livecd-desktop-default.ks
+
+* Sat Nov 29 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.0-1
 - Point fedora-live-base.ks repos to f-10
 - Remove sysprof from fedora-livedvd-developer.ks
 - Latest and final rebuild for Fedora 10