Branch 'F-10-Beta' - 3 commits - fedora-live-base.ks fedora-livecd-broffice.org.ks
by Jeroen van Meeuwen
fedora-live-base.ks | 9 +++------
fedora-livecd-broffice.org.ks | 6 +++---
2 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit c81d51ac693c2cd8c09d39df5174cd75d3852c3a
Merge: 0370b6f... d440660...
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Sep 14 23:12:11 2008 +0200
Merge branch 'master' into F-10-Beta
commit d440660c09ef3c1c6657a0ea7f2ba39798a4e09f
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Sun Sep 14 16:06:42 2008 -0400
Use GConf keys only for disabling packagekit update notification
The GConf keys for PackageKit now do the right thing for disabling checking
for updates and notifying the user about them. So use them rather than the
autostart hacked used in F9
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 6f76bf3..55f57cf 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -180,14 +180,11 @@ chkconfig --level 345 yum-updatesd off 2>/dev/null
# don't do packagekit checking by default
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_updates never >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_upgrades never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_refresh_cache never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_available false >/dev/null
-
-# apparently, the gconf keys aren't enough
-mkdir -p /home/fedora/.config/autostart
-echo "X-GNOME-Autostart-enabled=false" >> /home/fedora/.config/autostart/gpk-update-icon.desktop
-chown -R fedora:fedora /home/fedora/.config
-
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_distro_upgrades false >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/prompt_firmware false >/dev/null
# don't start cron/at as they tend to spawn things which are
commit 6f5d0e5e7ac00f045c7f65aa42b5f08d6586d02c
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Sun Sep 14 12:44:23 2008 -0300
More Asian fonts out
diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks
index 7521669..47b99a3 100644
--- a/fedora-livecd-broffice.org.ks
+++ b/fedora-livecd-broffice.org.ks
@@ -36,6 +36,9 @@ broffice.org-draw
-baekmuk-*
-cjkunifonts-*
-VLGothic-fonts
+-padauk-fonts
+-khmeros-fonts-base
+-un-core-fonts-*
# Assure we won't get these Asian input methods
-libchewing
@@ -47,15 +50,12 @@ broffice.org-draw
# Saving space in order to get BrOffice.org in
-gnome-utils
-gnome-games-*
--gnome-audio
-gnome-doc-utils-stylesheets
--gnome-user-share
-gnome-phone-manager
-planner
-scim-python*
-dasher
-system-config-language
--system-config-lvm
-evince-dvi
-evince-djvu
-ekiga
15 years, 8 months
fedora-live-base.ks
by Jeremy Katz
fedora-live-base.ks | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit d440660c09ef3c1c6657a0ea7f2ba39798a4e09f
Author: Jeremy Katz <katzj(a)redhat.com>
Date: Sun Sep 14 16:06:42 2008 -0400
Use GConf keys only for disabling packagekit update notification
The GConf keys for PackageKit now do the right thing for disabling checking
for updates and notifying the user about them. So use them rather than the
autostart hacked used in F9
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 6f76bf3..55f57cf 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -180,14 +180,11 @@ chkconfig --level 345 yum-updatesd off 2>/dev/null
# don't do packagekit checking by default
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_updates never >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_get_upgrades never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /apps/gnome-packagekit/frequency_refresh_cache never >/dev/null
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_available false >/dev/null
-
-# apparently, the gconf keys aren't enough
-mkdir -p /home/fedora/.config/autostart
-echo "X-GNOME-Autostart-enabled=false" >> /home/fedora/.config/autostart/gpk-update-icon.desktop
-chown -R fedora:fedora /home/fedora/.config
-
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/notify_distro_upgrades false >/dev/null
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-packagekit/prompt_firmware false >/dev/null
# don't start cron/at as they tend to spawn things which are
15 years, 8 months
fedora-livecd-broffice.org.ks
by Igor Pires Soares
fedora-livecd-broffice.org.ks | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6f5d0e5e7ac00f045c7f65aa42b5f08d6586d02c
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Sun Sep 14 12:44:23 2008 -0300
More Asian fonts out
diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks
index 7521669..47b99a3 100644
--- a/fedora-livecd-broffice.org.ks
+++ b/fedora-livecd-broffice.org.ks
@@ -36,6 +36,9 @@ broffice.org-draw
-baekmuk-*
-cjkunifonts-*
-VLGothic-fonts
+-padauk-fonts
+-khmeros-fonts-base
+-un-core-fonts-*
# Assure we won't get these Asian input methods
-libchewing
@@ -47,15 +50,12 @@ broffice.org-draw
# Saving space in order to get BrOffice.org in
-gnome-utils
-gnome-games-*
--gnome-audio
-gnome-doc-utils-stylesheets
--gnome-user-share
-gnome-phone-manager
-planner
-scim-python*
-dasher
-system-config-language
--system-config-lvm
-evince-dvi
-evince-djvu
-ekiga
15 years, 8 months
Changes to 'F-10-Beta'
by Jeroen van Meeuwen
New branch 'F-10-Beta' available with the following commits:
commit 0370b6fa3bbf5ddce0641ed3ca1927d08fac4c3b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Sep 14 16:34:21 2008 +0200
Clean out this branch so it can be used for composing F-10-Beta
15 years, 8 months
spin-kickstarts.spec.in
by Jeroen van Meeuwen
spin-kickstarts.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 39ea3b2a26b246d847b80a57ae676adcf203c6d9
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Sep 14 15:39:26 2008 +0200
Add documentation to RPM
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index f460be0..dfaabd3 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -1,4 +1,3 @@
-
Name: spin-kickstarts
Version: @VERSION@
Release: @RELEASE@%{?dist}
@@ -29,6 +28,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%doc COPYING README AUTHORS NEWS
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*
15 years, 8 months
fedora-livecd-kde.ks
by Sebastian Vahl
fedora-livecd-kde.ks | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit ec9b8d9bcc85f330dc1638643cb9e4a34d392e2a
Author: Sebastian Vahl <fedora(a)deadbabylon.de>
Date: Wed Sep 10 17:57:44 2008 +0200
don't include additional fonts (@fonts should be enough); add description to kickstart
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 73619bc..1ca9eef 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,3 +1,12 @@
+# fedora-livecd-kde.ks
+#
+# Description:
+# - Fedora Live Spin with the K Desktop Environment (KDE)
+#
+# Maintainer(s):
+# - Sebastian Vahl <fedora(a)deadbabylon.de>
+# - Fedora KDE SIG
+
%include fedora-live-base.ks
%packages
@@ -43,12 +52,12 @@ pavucontrol
# additional fonts
@fonts
-fonts-ISO8859-2
+#fonts-ISO8859-2
#cjkunifonts-ukai
-madan-fonts
-fonts-KOI8-R
-fonts-KOI8-R-100dpi
-tibetan-machine-uni-fonts
+#madan-fonts
+#fonts-KOI8-R
+#fonts-KOI8-R-100dpi
+#tibetan-machine-uni-fonts
# FIXME/TODO: recheck the removals here
15 years, 8 months
2 commits - fedora-livecd-broffice.org.ks
by Igor Pires Soares
fedora-livecd-broffice.org.ks | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e71b6584ad79c6f19ab7543dd98dcf0ea6a4de26
Merge: 09abe56... 08a12ea...
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Tue Sep 9 23:47:58 2008 -0300
Merge branch 'master' of git://git.fedorahosted.org/spin-kickstarts
commit 09abe5639ac11f20920da8eb73c71776041ad242
Author: Igor Pires Soares <igor(a)amd5600.(none)>
Date: Tue Sep 9 23:36:27 2008 -0300
Assure we won't get Asian input methods
diff --git a/fedora-livecd-broffice.org.ks b/fedora-livecd-broffice.org.ks
index 81bab88..7521669 100644
--- a/fedora-livecd-broffice.org.ks
+++ b/fedora-livecd-broffice.org.ks
@@ -37,16 +37,25 @@ broffice.org-draw
-cjkunifonts-*
-VLGothic-fonts
+# Assure we won't get these Asian input methods
+-libchewing
+-anthy
+-kasumi
+-scim-chewing
+-scim-pinyin
# Saving space in order to get BrOffice.org in
-gnome-utils
-gnome-games-*
+-gnome-audio
+-gnome-doc-utils-stylesheets
+-gnome-user-share
+-gnome-phone-manager
-planner
-scim-python*
--scim-chewing
--scim-pinyin
-dasher
-system-config-language
+-system-config-lvm
-evince-dvi
-evince-djvu
-ekiga
15 years, 8 months
2 commits - fedora-aos.ks
by Bryan Kearney
fedora-aos.ks | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 08a12ea4eb0118a46f039b7f0a3db82858b405d1
Merge: 2a7ce06... 996573d...
Author: Bryan Kearney <bkearney(a)redhat.com>
Date: Mon Sep 8 10:02:59 2008 -0400
Merge branch 'master' of git://git.fedorahosted.org/spin-kickstarts
commit 2a7ce0622a9d2801eb6adff9e8a92f42b357bbb9
Author: root <root(a)localhost.localdomain>
Date: Thu Sep 4 09:00:14 2008 -0400
Enabled Selinux, but made it permissive
diff --git a/fedora-aos.ks b/fedora-aos.ks
index a1b11ee..da03346 100644
--- a/fedora-aos.ks
+++ b/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
15 years, 8 months
fedora-livecd-desktop-de_CH.ks fedora-livecd-electronic-lab-de_CH.ks fedora-livecd-kde-de_CH.ks fedora-livecd-xfce-de_CH.ks fedora-livedvd-developer-de_CH.ks fedora-livedvd-games-de_CH.ks templates/language-de_CH.ks
by Fabian Affolter
fedora-livecd-desktop-de_CH.ks | 27 +++++++++++++++++++++++++++
fedora-livecd-electronic-lab-de_CH.ks | 14 ++++++++++++++
fedora-livecd-kde-de_CH.ks | 26 ++++++++++++++++++++++++++
fedora-livecd-xfce-de_CH.ks | 14 ++++++++++++++
fedora-livedvd-developer-de_CH.ks | 25 +++++++++++++++++++++++++
fedora-livedvd-games-de_CH.ks | 14 ++++++++++++++
templates/language-de_CH.ks | 11 +++++++++++
7 files changed, 131 insertions(+)
New commits:
commit 996573df652e5f3a5157202bf6370c3ce4b361d2
Author: Fabian Affolter <fab(a)fedoraproject.org>
Date: Sat Sep 6 18:25:48 2008 +0200
Initial versions for de_CH (Swiss german)
Language: de_DE
Keyboard: sg-latin1
Be aware, the files are not tested yet.
diff --git a/fedora-livecd-desktop-de_CH.ks b/fedora-livecd-desktop-de_CH.ks
new file mode 100644
index 0000000..7109931
--- /dev/null
+++ b/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
+
diff --git a/fedora-livecd-electronic-lab-de_CH.ks b/fedora-livecd-electronic-lab-de_CH.ks
new file mode 100644
index 0000000..a2456f6
--- /dev/null
+++ b/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
diff --git a/fedora-livecd-kde-de_CH.ks b/fedora-livecd-kde-de_CH.ks
new file mode 100644
index 0000000..e19fa4f
--- /dev/null
+++ b/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
diff --git a/fedora-livecd-xfce-de_CH.ks b/fedora-livecd-xfce-de_CH.ks
new file mode 100644
index 0000000..9f2ece4
--- /dev/null
+++ b/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
diff --git a/fedora-livedvd-developer-de_CH.ks b/fedora-livedvd-developer-de_CH.ks
new file mode 100644
index 0000000..573a80b
--- /dev/null
+++ b/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
diff --git a/fedora-livedvd-games-de_CH.ks b/fedora-livedvd-games-de_CH.ks
new file mode 100644
index 0000000..68579b9
--- /dev/null
+++ b/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
diff --git a/templates/language-de_CH.ks b/templates/language-de_CH.ks
new file mode 100644
index 0000000..c70f708
--- /dev/null
+++ b/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
15 years, 8 months
fedora-livedvd-electronic-lab.ks
by Chitlesh GOORAH
fedora-livedvd-electronic-lab.ks | 109 ++++++++++++++++++---------------------
1 file changed, 53 insertions(+), 56 deletions(-)
New commits:
commit edd4c149703747ccb7ecd745a16e720778de5672
Author: Chitlesh Goorah <chitlesh(a)localhost.localdomain>
Date: Wed Sep 3 18:51:39 2008 +0200
tuned to kde live spin
diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index bcdf6ac..7a43065 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/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
-desktop-backgrounds-basic
+# removing useless application from KDE ks
+-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
-koffice-kword
-koffice-kplato
-koffice-filters
+openoffice.org-writer
+openoffice.org-math
+openoffice.org-writer2latex
+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
-cat > /usr/share/kde-settings/kde-profile/default/share/config/kwinrc <<EOF
-[Style]
-ButtonsOnLeft=MB
-ButtonsOnRight=FIAX
-CustomButtonPositions=true
-EOF
+# Fedora Electronic Lab:
+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 > /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
+cat > /home/fedora/.kde/share/config/kxkbrc <<EOF
[Layout]
-DisplayNames=
-EnableXkbOptions=false
-IncludeGroups=
-LayoutList=us,de,ch,fr,jp
+DisplayNames=us,ch,de,fr
+IndicatorOnly=false
+LayoutList=us,ch,de,fr
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
-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
-
+# icon taken from fedora-logos and applied by kde-settings
# 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
15 years, 8 months