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

fedora-aos.ks

@@ -5,7 +5,7 @@ lang C
 keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
-selinux --disabled
+selinux --permissive
 firewall --disabled
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on

fedora-livecd-desktop-de_CH.ks

@@ -0,0 +1,27 @@
+# fedora-livecd-desktop-de_CH.ks
+#
+# Maintainer(s):
+# - Fabian Affolter <fab at fedoraproject.org>
+
+%include fedora-livecd-desktop.ks
+
+lang de_DE.UTF-8
+keyboard sg-latin1-nodeadkeys
+timezone Europe/Zurich
+
+%packages
+-gnome-blog
+@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"
+    Driver "kbd"
+    Option "XkbLayout" "sg-latin1-nodeadkeys"
+EndSection
+EOF
+%end
+

fedora-livecd-electronic-lab-de_CH.ks

@@ -0,0 +1,14 @@
+# fedora-livecd-electronic-lab-de_CH.ks
+#
+# Maintainer(s):
+# - Fabian Affolter <fab a fedoraproject.org>
+
+%include fedora-livecd-electronic-lab.ks
+
+lang de_DE
+keyboard sg-latin1
+timezone Europe/Zurich
+
+%packages
+@german-support
+%end

fedora-livecd-kde-de_CH.ks

@@ -0,0 +1,26 @@
+# fedora-livecd-kde-de_CH.ks
+#
+# Maintainer(s):
+# - Fabian Affolter <fab at fedoraproject.org>
+
+%include fedora-livecd-kde.ks
+
+lang de_DE.UTF-8
+keyboard sg-latin1-nodeadkeys
+timezone Europe/Zurich
+
+%packages
+@german-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 "sg-latin1-nodeadkeys" with the keyboard layout you have used above
+mkdir -p /home/fedora/.kde/env
+echo "system-config-keyboard --noui sg-latin1-nodeadkeys" > /home/fedora/.kde/env/keyboard.sh
+chmod +x /home/fedora/.kde/env/keyboard.sh
+chown -R fedora:fedora /home/fedora/.kde/env/
+
+%end

fedora-livecd-xfce-de_CH.ks

@@ -0,0 +1,14 @@
+# fedora-livecd-xfce-de_CH.ks
+#
+# Maintainer(s):
+# - Fabian Affolter <fab at fedoraproject.org>
+
+%include fedora-livecd-xfce.ks
+
+lang de_DE
+keyboard sg-latin1-nodeadkeys
+timezone Europe/Zurich
+
+%packages
+@german-support
+%end

fedora-livedvd-developer-de_CH.ks

@@ -0,0 +1,25 @@
+# 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-electronic-lab.ks

@@ -1,9 +1,9 @@
 # Description : Live DVD image for Fedora Electronic Lab
-# last updated: 11 June 2008
+# last updated: 10 August 2008
 #
 # Maintainer(s):
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>
-# - Thibault North <tnorth a fedoraproject.org>
+# - Thibault North  <tnorth a fedoraproject.org>
 
 %include fedora-livecd-kde.ks
 
@@ -13,23 +13,33 @@
 kmenu-gnome
 kdesvn
 yakuake
+kdebluetooth
 
 
-# include default fedora wallpaper
+# removing useless application from KDE ks
-desktop-backgrounds-basic
+-kdegames
+-koffice-kword
+-koffice-kspread
+-koffice-kpresenter
+-koffice-filters
 
-wget
-planner
 
 # some projects based on ghdl and gtkwave needs
 zlib-devel
 
-#project management
+
+# Office
 vym
-koffice-kspread
+openoffice.org-writer
-koffice-kword
+openoffice.org-math
-koffice-kplato
+openoffice.org-writer2latex
-koffice-filters
+openoffice.org-calc
+openoffice.org-impress
+openoffice.org-extendedPDF
+openoffice.org-ooolatex
+kile
+planner
+
 
 # some other extra packages
 ntfsprogs
@@ -43,14 +53,21 @@ gnupg
 hal-cups-utils
 firefox
 libflashsupport
-kile
+bluez-gnome
+gnome-bluetooth
 
 
 # ignore comps.xml and make sure these packages are included
 rhgb
 make
+# include default fedora wallpaper
+desktop-backgrounds-basic
+fedora-logos
+wget
+tkcvs
 
-#vlsi
+
+# vlsi
 alliance-doc
 irsim
 gds2pov
@@ -67,21 +84,20 @@ pharosc-synopsys
 pharosc-xcircuit
 sk2py
 
-
+# Hardware Description Languages
-#Hardware Description Languages
 gtkwave
 iverilog
 drawtiming
 ghdl
 freehdl
 
-#spice
+# spice
 ngspice
 gnucap
-#gspiceui
+gspiceui
 gwave
 
-#PCB and schematics
+# PCB and schematics
 geda-gschem
 geda-examples
 geda-gsymcheck
@@ -94,7 +110,7 @@ gresistor
 kicad
 pcb
 
-#Micro Programming
+# Micro Programming
 piklab
 ktechlab
 pikloops
@@ -105,7 +121,7 @@ gtkterm
 picocom
 minicom
 
-#embedded
+# embedded
 arm-gp2x-linux*
 avr-*
 avrdude
@@ -113,70 +129,51 @@ dfu-programmer
 avarice
 uisp
 
-#computing
+# computing
 octave
 octave-forge
 
+# Oracle Berkeley database
+db4-cxx
+db4-tcl
+
+# Extra support for compiling SystemC (not yet fedora compatible)
+compat-gcc-34-c++
+
 %end
 
 %post
 
 ###### Fedora Electronic Lab ####################################################
 
-# Fedora Electronic Lab: Kwin buttons
+# Fedora Electronic Lab:
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
-[Style]
-ButtonsOnLeft=MB
-ButtonsOnRight=FIAX
-CustomButtonPositions=true
-EOF
 
+mkdir -p /home/fedora/.kde/share/config/
 
 # kill stupid klipper
-cat > /usr/share/kde-settings/kde-profile/default/share/config/klipperrc <<EOF
+cat > /home/fedora/.kde/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 > /home/fedora/.kde/share/config/kxkbrc <<EOF
-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=
+DisplayNames=us,ch,de,fr
-EnableXkbOptions=false
+IndicatorOnly=false
-IncludeGroups=
+LayoutList=us,ch,de,fr
-LayoutList=us,de,ch,fr,jp
 Model=pc104
 Options=
-ResetOldOptions=false
+ResetOldOptions=true
 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
+# icon taken from fedora-logos and applied by kde-settings
-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
-
 
 # FEL doesn't need these and boots slowly
-/sbin/chkconfig anacron   off 2>/dev/null
 /sbin/chkconfig sendmail  off 2>/dev/null
 /sbin/chkconfig nfs       off 2>/dev/null
 /sbin/chkconfig nfslock   off 2>/dev/null

fedora-livedvd-games-de_CH.ks

@@ -0,0 +1,14 @@
+# fedora-livedvd-games-de_CH.ks
+#
+# Maintainer(s):
+# - Fabian Affolter <fab a fedoraproject.org>
+
+%include fedora-livedvd-games.ks
+
+lang de_DE
+keyboard sg-latin1
+timezone Europe/Zurich
+
+%packages
+@german-support
+%end

templates/language-de_CH.ks

@@ -0,0 +1,11 @@
+# %post language-modifications for de_DE-spins
+
+# system-config-keyboard doesn't really work (missing xorg.conf etc)
+cat >>/etc/X11/xorg.conf << EOF
+Section "InputDevice"
+    Identifier "Keyboard0"
+    Driver "kbd"
+    Option	    "XkbLayout" "ch"
+    Option	    "XkbVariant" "de_nodeadkeys"
+EndSection
+EOF