make sure that alsunmute is there for working sound; make sure /usr/bin/pactl is there for workaround #466544

We weren't running any of this if you had persistence configured and you had
already booted.  We should at least mount the persistent /home and turn on
swap for that case as well as doing our tmpfs mounts

AUTHORS

@@ -0,0 +1,15 @@
+Bryan Kearney
+Chitlesh Goorah
+Colin Walters
+Fabian Affolter
+Igor Pires Soares
+Jens Petersen
+Jeremy Katz
+Jeroen van Meeuwen
+Jesse Keating
+Matthias Clasen
+Pedro Silva
+Rahul Sundaram
+Sebastian Dziallas
+Sebastian Vahl
+wart

Makefile.am

@@ -3,29 +3,32 @@
 kickstartdir = $(pkgdatadir)/
 kickstart_DATA = \
     fedora-aos.ks \
+    fedora-install-fedora.ks \
     fedora-live-base.ks \
-    fedora-livecd-desktop-de_DE.ks \
-    fedora-livecd-desktop-default.ks \
-    fedora-livecd-desktop-en_US.ks \
     fedora-livecd-desktop.ks \
+    fedora-livecd-desktop-default.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-electronic-lab.ks \
-    fedora-livecd-electronic-lab-nl_NL.ks \
-    fedora-livecd-electronic-lab-pt_PT.ks \
-    fedora-livecd-kde-de_DE.ks \
     fedora-livecd-kde.ks \
+    fedora-livecd-kde-de_CH.ks \
+    fedora-livecd-kde-de_DE.ks \
     fedora-livecd-kde-nl_NL.ks \
     fedora-livecd-kde-pt_PT.ks \
     fedora-livecd-xfce.ks \
+    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-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 \
+    fedora-livedvd-electronic-lab-pt_PT.ks \
     fedora-livedvd-games.ks \
     fedora-livedvd-games-nl_NL.ks \
     fedora-livedvd-games-pt_PT.ks

NEWS

@@ -0,0 +1 @@
+Most news is on http://fedorahosted.org/spin-kickstarts

configure.ac

@@ -1,18 +1,11 @@
-AC_INIT([spin-kickstarts], 0.01)
-AC_SUBST([RELEASE], 2)
+AC_INIT([spin-kickstarts], 0.10.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"
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
-#dnl prevent to copy po/Makefile.in.in
-#GETTEXT_PACKAGE=revisor
-#AC_SUBST(GETTEXT_PACKAGE)
-#AM_GLIB_GNU_GETTEXT
-#AC_PROG_INTLTOOL
-#AC_PROG_LN_S
-
 AC_SUBST(DATESTAMP,`date +"%a %b %d %Y"`)
 
 AC_CONFIG_FILES([

fedora-install-fedora.ks

@@ -5,7 +5,7 @@
 
 # Use a part of 'iso' to define how large you want your isos.
 # Only used when composing to more than one iso.
-# Default is 670 (megs), CD size.
+# Default is 695 (megs), CD size.
 # Listed below is the size of a DVD if you wanted to split higher.
 #part iso --size=4998
 
@@ -44,6 +44,7 @@ wireshark-gnome
 # Devel packages
 @development-libs
 @development-tools
+@fedora-packager
 @gnome-software-development
 @java-development
 @kde-software-development
@@ -60,6 +61,8 @@ wireshark-gnome
 @smb-server
 @sql-server
 @web-server --optional
+# Keep dap off the install media, makes Eng & Sci show up
+-dap-server-cgi
 # Virt group
 @virtualization --optional
 # filesystem stuff

fedora-live-base.ks

@@ -12,7 +12,7 @@ keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
 selinux --enforcing
-firewall --disabled
+firewall --enabled
 xconfig --startxonboot
 part / --size 3072
 services --enabled=NetworkManager --disabled=network,sshd
@@ -99,10 +99,14 @@ cat > /etc/rc.d/init.d/livesys << EOF
 
 . /etc/init.d/functions
 
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-configured ] ; then
+if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ]; then
     exit 0
 fi
 
+if [ -e /.liveimg-configured ] ; then
+    configdone=1
+fi
+
 exists() {
     which \$1 >/dev/null 2>&1 || return
     \$*
@@ -183,6 +187,17 @@ if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; the
   action "Mounting persistent /home" mountPersistentHome
 fi
 
+# make it so that we don't do writing to the overlay for things which
+# are just tmpdirs/caches
+mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
+mount -t tmpfs tmp /tmp
+mount -t tmpfs vartmp /var/tmp
+[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1
+
+if [ -n "\$configdone" ]; then
+  exit 0
+fi
+
 # add fedora user with no passwd
 action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
 passwd -d liveuser > /dev/null
@@ -220,13 +235,6 @@ chkconfig --level 345 anacron off 2>/dev/null
 chkconfig --level 345 readahead_early off 2>/dev/null
 chkconfig --level 345 readahead_later off 2>/dev/null
 
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
-mount -t tmpfs tmp /tmp
-mount -t tmpfs vartmp /var/tmp
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /tmp /var/tmp >/dev/null 2>&1
-
 # Stopgap fix for RH #217966; should be fixed in HAL instead
 touch /media/.hal-mtab
 
@@ -321,6 +329,7 @@ Section "Device"
 
 	Option     "AccelMethod" "EXA"
 	Option     "NoCompression" "true"
+        Option     "MigrationHeuristic" "greedy"
 	Option     "PanelGeometry" "1200x900"
 EndSection
 
@@ -339,9 +348,11 @@ fi
 
 # if liveinst or textinst is given, start anaconda
 if strstr "\`cat /proc/cmdline\`" liveinst ; then
+   plymouth --quit
    /usr/sbin/liveinst \$ks
 fi
 if strstr "\`cat /proc/cmdline\`" textinst ; then
+   plymouth --quit
    /usr/sbin/liveinst --text \$ks
 fi
 

fedora-livecd-desktop-pt_PT.ks

@@ -12,6 +12,3 @@ timezone Europe/Lisbon
 %packages
 @portuguese-support
 %end
-
-%post
-%end

fedora-livecd-electronic-lab-pt_PT.ks

@@ -1,24 +0,0 @@
-# fedora-livecd-electronic-lab-pt_PT.ks
-#
-# Maintainer(s):
-# - Pedro Silva <pedrofsilva a netcabo.pt>
-
-%include fedora-livecd-electronic-lab.ks
-
-lang pt_PT.UTF-8
-keyboard pt-latin1
-timezone Europe/Lisbon
-
-%packages
-@portuguese-support
-%end
-
-%post
-# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
-# KDE don't use /etc/sysconfig/keyboard.
-# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/liveuser/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
-chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R liveuser:liveuser /home/liveuser/.kde/env/
-%end

fedora-livecd-electronic-lab.ks

@@ -1,240 +0,0 @@
-# fedora-livecd-electronic-lab.ks
-#
-# Maintainer(s):
-# - Chitlesh Goorah <chitlesh a fedoraproject.org>
-# - Tibaut North <tnorth a fedoraproject.org>
-
-%include fedora-live-base.ks
-
-%packages
-# KDE basic packages
-kdebase
-kde-filesystem
-kdelibs
-kdenetwork
-kdegraphics
-kdeutils
-kde-settings
-kmenu-gnome
-kdesvn
-yakuake
-# include default fedora wallpaper
-desktop-backgrounds-basic
-wget
-
-# some projects based on ghdl and gtkwave needs
-zlib-devel
-
-#project management
-vym
-koffice-kspread
-koffice-kword
-koffice-kplato
-koffice-filters
-
-# some other extra packages
-ntfsprogs
-ntfs-3g
-synaptics
-setroubleshoot
-smolt
-smolt-firstboot
-syslinux
-gnupg
-hal-cups-utils
-
-# we don't want these
--dos2unix
--firefox
--authconfig-gtk
--PolicyKit-gnome
--gnome-doc-utils-stylesheets
-
-# ignore comps.xml and make sure these packages are included
-kpowersave
-rhgb
-
-
-#vlsi
-alliance-doc
-irsim
-gds2pov
-magic-doc
-toped
-xcircuit
-qucs
-netgen
-
-#Hardware Description Languages
-gtkwave
-iverilog
-drawtiming
-ghdl
-freehdl
-
-#spice
-ngspice
-gnucap
-#gspiceui
-#gwave
-
-#PCB and schematics
-geda-gschem
-geda-examples
-geda-gsymcheck
-geda-gattrib
-geda-utils
-geda-docs
-geda-gnetlist
-gerbv
-gresistor
-kicad
-pcb
-
-#Micro Programming
-piklab
-ktechlab
-pikloops
-sdcc
-
-# Serial Port Terminals
-gtkterm
-picocom
-minicom
-
-#embedded
-arm-gp2x-linux*
-avr-*
-avrdude
-dfu-programmer
-avarice
-uisp
-
-#computing
-octave
-octave-forge
-
-%end
-
-%post
-
-###### Fedora Electronic Lab ####################################################
-
-# Fedora Electronic Lab: Kwin buttons
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
-[Style]
-ButtonsOnLeft=MB
-ButtonsOnRight=FIAX
-CustomButtonPositions=true
-EOF
-
-# kill klipper
-cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
-[General]
-AutoStart=false
-EOF
-
-# use the LCD_Style clock as alliance's windows demand a lot of space on kicker
-cat > /usr/share/kde-settings/kde-profile/default/share/config/clock_panelappletrc <<EOF
-[Digital]
-LCD_Style=false
-Show_Date=false
-Show_Seconds=true
-
-[General]
-Type=Digital
-EOF
-
-
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kxkbrc <<EOF
-[Layout]
-DisplayNames=
-EnableXkbOptions=false
-IncludeGroups=
-LayoutList=us,de,fr,jp
-Model=pc104
-Options=
-ResetOldOptions=false
-ShowFlag=true
-ShowSingle=true
-StickySwitching=false
-StickySwitchingDepth=2
-SwitchMode=Global
-Use=true
-EOF
-
-# Chitlesh doesn't like the KDE icon on the kicker, but fedora's
-# This is a feature for Fedora and not for KDE
-cp -fp /usr/share/icons/Bluecurve/16x16/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/16x16/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/24x24/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/22x22/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/32x32/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/32x32/apps/kmenu.png
-cp -fp /usr/share/icons/Bluecurve/48x48/apps/gnome-main-menu.png /usr/share/icons/crystalsvg/48x48/apps/kmenu.png
-
-###### KDE #####################################################################
-
-# create /etc/sysconfig/desktop (needed for installation)
-cat > /etc/sysconfig/desktop <<EOF
-DESKTOP="KDE"
-DISPLAYMANAGER="KDE"
-EOF
-
-# add initscript qnd # Fedora Electronic Lab:  KDE keyboard layouts
-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
-
-# disable screensaver
-sed -i 's/Enabled=true/Enabled=false/' /usr/share/kde-settings/kde-profile/default/share/config/kdesktoprc
-
-# workaround to put liveinst on desktop and in menu
-sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
-EOF
-
-# and set up gnome-keyring to startup/shutdown in kde
-mkdir -p /etc/skel/.kde/env /etc/skel/.kde/shutdown
-cat > /etc/skel/.kde/env/start-custom.sh << EOF
-#!/bin/sh
-eval \`gnome-keyring-daemon\`
-export GNOME_KEYRING_PID
-export GNOME_KEYRING_SOCKET
-EOF
-chmod 755 /etc/skel/.kde/env/start-custom.sh
-
-cat > /etc/skel/.kde/shutdown/stop-custom.sh << EOF
-#/bin/sh
-if [-n "$GNOME_KEYRING_PID"]; then
-	kill $GNOME_KEYRING_PID
-fi
-EOF
-
-chmod 755 /etc/skel/.kde/shutdown/stop-custom.sh
-
-###### Fedora Electronic Lab ####################################################
-
-# FEL doesn't need these and boots slowly
-/sbin/chkconfig anacron off
-/sbin/chkconfig sendmail off
-/sbin/chkconfig nfs off
-/sbin/chkconfig nfslock off
-/sbin/chkconfig rpcidmapd off
-/sbin/chkconfig rpcbind off
-
-%end
-

fedora-livecd-kde-de_DE.ks

@@ -12,15 +12,39 @@ timezone Europe/Berlin
 %packages
 @german-support
 
+# don't use kpackagekit until it's translated
+-kpackagekit
+gnome-packagekit
+
+# don't install unnecessary input methods
+-scim*
+-m17n*
+-iok
+
+# don't install unnecessary fonts
+-abyssinica-fonts
+-cjkunifonts-uming
+-jomolhari-fonts
+-kacst-fonts
+-khmeros-fonts-base
+-lklug-fonts
+-un-core-fonts-dotum
+-padauk-fonts
+-paktype-fonts
+-smc-fonts-meera
+-stix-fonts
+-thaifonts-scalable
+-VLGothic-fonts
+
 %end
 
 %post
 # set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
 # KDE don't use /etc/sysconfig/keyboard.
 # Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/liveuser/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
-chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R liveuser:liveuser /home/liveuser/.kde/env/
+#mkdir -p /home/liveuser/.kde/env
+#echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
+#chmod +x /home/liveuser/.kde/env/keyboard.sh
+#chown -R liveuser:liveuser /home/liveuser/
 
-%end
+%end

fedora-livecd-kde-pt_PT.ks

@@ -11,15 +11,4 @@ timezone Europe/Lisbon
 
 %packages
 @portuguese-support
-
-%end
-
-%post
-# set up localized keyboard since it is not used in /etc/X11/xorg.conf anymore and
-# KDE don't use /etc/sysconfig/keyboard.
-# Replace "de-latin1-nodeadkeys" with the keyboard layout you have used above
-mkdir -p /home/liveuser/.kde/env
-echo "system-config-keyboard --noui de-latin1-nodeadkeys" > /home/liveuser/.kde/env/keyboard.sh
-chmod +x /home/liveuser/.kde/env/keyboard.sh
-chown -R liveuser:liveuser /home/liveuser/.kde/env/
 %end

fedora-livecd-kde.ks

@@ -11,13 +11,13 @@
 
 %packages
 
-# adding this manually although it should be a dependency (#466768)
-usermode-gtk
-
 # make kpackagekit the default on the kde live images
 kpackagekit
 -gnome-packagekit
 
+# make sure /usr/bin/pactl is there (#466544)
+pulseaudio-utils
+
 @kde-desktop
 
 # unwanted packages from @kde-desktop
@@ -26,9 +26,10 @@ kpackagekit
 ### amarok has duplicate functionality with juk (~10 megs)
 #-amarok
 ### digikam has duplicate functionality with gwenview (~11 megs)
--digikam
-### kdeedu is too big for the live images
+#-digikam
+### kdeedu is too big for the live images, but include kdeedu-kstars
 -kdeedu
+kdeedu-kstars
 ### scribus is too big for the live images
 -scribus
 ### kget has also basic torrent features (~3 megs)
@@ -49,14 +50,18 @@ koffice-filters
 k3b
 filelight
 # twinkle (~10 megs)
-#twinkle
+twinkle
 
 
 # some extras
 fuse
 liveusb-creator
-# nice to have but pulls in gstreamer
-#pavucontrol
+# nice to have but pulls in gstreamer (~3 megs)
+pavucontrol
+konq-plugins
+kde-plasma-lancelot
+# make sure alsaunmute is there
+alsa-utils
 
 
 # additional fonts

fedora-livecd-sugar.ks

@@ -1,204 +0,0 @@
-# Filename:
-#   fedora-livecd-sugar.ks
-# Maintainers:
-#   Sebastian Dziallas <sdz AT fedoraproject DOT org>
-
-%include fedora-live-base.ks
-
-selinux --disabled
-
-%packages
-
-# sugar!
-@sugar-desktop
-# add temporarily until it gets added to comps
-sugar-browse
-sugar-calculator
-sugar-log
-
-# rebranding
--fedora-release
-generic-release
-
-# display manager
-slim
-
-# language support
-@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
-
-# 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-*
--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
--yelp
--gnome-user-docs
--gimp-help
--gimp-help-browser
--evolution-help
--gnome-games
--gnome-games-help
--nss_db
--vino
--isdn4k-utils
--dasher
--evince-dvi
--evince-djvu
-# not needed for gnome
--acpid
-
-# these pull in excessive dependencies
--ekiga
--tomboy
--f-spot
-
-# hack to deal with conditionals + multiarch blargh
--scim-bridge-gtk.i386
-%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-livedvd-developer-pt_PT.ks

@@ -12,6 +12,3 @@ timezone Europe/Lisbon
 %packages
 @portuguese-support
 %end
-
-%post
-%end

fedora-livedvd-electronic-lab-de_CH.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Fabian Affolter <fab a fedoraproject.org>
 
-%include fedora-livecd-electronic-lab.ks
+%include fedora-livedvd-electronic-lab.ks
 
 lang de_DE
 keyboard sg-latin1

fedora-livedvd-electronic-lab-nl_NL.ks

@@ -3,7 +3,7 @@
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include fedora-livecd-electronic-lab.ks
+%include fedora-livedvd-electronic-lab.ks
 
 lang nl_NL
 keyboard us

fedora-livedvd-electronic-lab-pt_PT.ks

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

fedora-livedvd-electronic-lab.ks

@@ -1,5 +1,5 @@
 # Description : Live DVD image for Fedora Electronic Lab
-# last updated: 10 August 2008
+# last updated: 15 November 2008 - ready for F10 Cambridge.
 #
 # Maintainer(s):
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>
@@ -13,7 +13,6 @@ part / --size=8192
 %packages
 
 # KDE basic packages
-kmenu-gnome
 kdesvn
 yakuake
 kdebluetooth
@@ -25,7 +24,7 @@ kdebluetooth
 -koffice-kspread
 -koffice-kpresenter
 -koffice-filters
-
+-kdeedu-kstars
 
 # some projects based on ghdl and gtkwave needs
 zlib-devel
@@ -55,7 +54,6 @@ syslinux
 gnupg
 hal-cups-utils
 firefox
-libflashsupport
 bluez-gnome
 gnome-bluetooth
 
@@ -130,10 +128,17 @@ avrdude
 dfu-programmer
 avarice
 uisp
+# debugging tools
+gdb
+valgrind
+kdbg
+wireshark-gnome
+qemu
 
 # computing
 octave
 octave-forge
+qtoctave
 
 # Oracle Berkeley database
 db4-cxx
@@ -142,6 +147,13 @@ db4-tcl
 # Extra support for compiling SystemC (not yet fedora compatible)
 compat-gcc-34-c++
 
+# TCL gui apps through ssh support, e.g modelsim and cadence icfb
+xorg-x11-fonts-100dpi
+xorg-x11-fonts-ISO8859-1-100dpi
+xorg-x11-fonts-ISO8859-9-100dpi
+xorg-x11-fonts-Type1
+
+
 %end
 
 %post
@@ -150,15 +162,17 @@ compat-gcc-34-c++
 
 # Fedora Electronic Lab:
 
-mkdir -p /home/liveuser/.kde/share/config/
+cat >> /etc/rc.d/init.d/livesys << EOF
 
 # kill stupid klipper
-cat > /home/liveuser/.kde/share/config/klipperrc <<EOF
+cat > /home/liveuser/.kde/share/config/klipperrc <<KLIPPER_EOF
 [General]
 AutoStart=false
-EOF
+KLIPPER_EOF
 
-cat > /home/liveuser/.kde/share/config/kxkbrc <<EOF
+chown liveuser:liveuser /home/liveuser/.kde/share/config/klipperrc
+
+cat > /home/liveuser/.kde/share/config/kxkbrc << KXKBRC_EOF
 [Layout]
 DisplayNames=us,ch,de,fr
 IndicatorOnly=false
@@ -170,7 +184,9 @@ ShowFlag=true
 ShowSingle=true
 SwitchMode=Global
 Use=true
-EOF
+KXKBRC_EOF
+
+chown liveuser:liveuser /home/liveuser/.kde/share/config/kxkbrc
 
 # Chitlesh doesn't like the KDE icon on the kicker, but fedora's
 # icon taken from fedora-logos and applied by kde-settings
@@ -182,5 +198,6 @@ EOF
 /sbin/chkconfig rpcidmapd off 2>/dev/null
 /sbin/chkconfig rpcbind   off 2>/dev/null
 
+EOF
 
 %end

fedora-livedvd-games-pt_PT.ks

@@ -12,6 +12,3 @@ timezone Europe/Lisbon
 %packages
 @portuguese-support
 %end
-
-%post
-%end

spin-kickstarts.spec.in

@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Package updates to kickstarts into F-10 package
+
+* Fri Nov 07 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.1-1
 - Second build for review #448072
 
 * Fri May 23 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.01-1