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

@@ -13,7 +13,7 @@ kickstart_DATA = \
     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.11.1)
+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-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

fedora-livecd-education-math.ks

@@ -1,146 +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
--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
--gdm
--authconfig-gtk
--PolicyKit-gnome
--gnome-doc-utils-stylesheets
--pygtkglext
--python-devel
-# exclude input methods
--scim*
--m17n*
-
-# 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.ks

@@ -17,6 +17,10 @@
 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
 
@@ -52,9 +56,12 @@ alsa-utils
 -kaffeine*
 ### the removal of kdegames will free ~35 megs
 #-kdegames
+### kdeartwork is not really needed
+-kdeartwork
+
 # some more
 -kipi-plugins
--konq-plugins
+#-konq-plugins
 -kdeplasma-addons
 
 
@@ -74,7 +81,6 @@ filelight
 # some extras
 fuse
 liveusb-creator
-#kde-plasma-lancelot
 
 # nice to have but pulls in gstreamer (~3 megs)
 #pavucontrol

fedora-livecd-sugar.ks

@@ -1,64 +0,0 @@
-# Filename:
-#   fedora-livecd-sugar.ks
-# Maintainers:
-#   Sebastian Dziallas <sdz AT fedoraproject DOT org>
-#   Marco Pesenti Gritti <marcopg AT sugarlabs DOT org>
-
-%include fedora-live-base.ks
-
-%packages
-
-# sugar!
-@sugar-desktop
-
-# e-mail client
-alpine
-
-# display manager
-slim
-
-# exclude input methods
--scim*
--m17n*
-
-# avoid weird case where we pull in more festival stuff than we need
-festival
-festvox-slt-arctic-hts
-
-# dictionaries are big
--aspell-*
--hunspell-*
--man-pages-*
--words
-
-%end
-
-%post
-cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/bin/slim-dynwm
-EOF
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-chkconfig --level 5 setroubleshoot off 2>/dev/null
-chkconfig --level 5 sendmail off 2>/dev/null
-chkconfig --level 5 bluetooth off 2>/dev/null
-chkconfig --level 5 cupsd off 2>/dev/null
-
-# 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/slim.conf << FOE
-auto_login	yes
-default_user	liveuser
-FOE
-
-# setup xinitrc
-echo "sugar-shell" > /home/liveuser/.xinitrc
-chmod a+x /home/liveuser/.xinitrc
-chown liveuser:liveuser /home/liveuser/.xinitrc
-
-EOF
-
-%end

fedora-livecd-xfce.ks

@@ -16,8 +16,6 @@
 -imsettings-xfce
 
 firefox
-NetworkManager-vpnc
-NetworkManager-openvpn
 NetworkManager-gnome
 NetworkManager-pptp
 

fedora-livedvd-developer-de_CH.ks

@@ -1,28 +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
-# exclude input methods
--m17n*
--scim*
-%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,17 +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
-# exclude input methods
--m17n*
--scim*
-%end

fedora-livedvd-developer-pt_PT.ks

@@ -1,17 +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
-# exclude input methods
--m17n*
--scim*
-%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-games.ks

@@ -73,11 +73,9 @@ abe
 alex4
 ballz
 blobwars
-bolzplatz2006
 bombardier
 cdogs-sdl
 clanbomber
-clonekeen
 foobillard
 glaxium
 gnubg
@@ -93,12 +91,9 @@ nethack
 openlierox
 pachi
 pioneers
-quake3
-quake3-demo
 quarry
 Ri-li
 rogue
-rott-shareware
 scorchwentbonkers
 seahorse-adventures
 solarwolf
@@ -106,7 +101,6 @@ sopwith
 stormbaancoureur
 ularn
 urbanterror
-vavoom
 worldofpadman
 xblast
 

spin-kickstarts.spec.in

@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Removed developer spin from the mix
+
+* 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