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

6 files changed, 36 insertions, 20 deletions

diff --git a/fedora-livecd-desktop-pt_PT.ks b/fedora-livecd-desktop-pt_PT.ks
index b3be353..78fe1d8 100644
--- a/fedora-livecd-desktop-pt_PT.ks
+++ b/fedora-livecd-desktop-pt_PT.ks
@@ -11,15 +11,15 @@ timezone Europe/Lisbon
 

 %packages

 @portuguese-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" "pt-latin1"
-EndSection
-EOF
-%end
+%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" "pt"

+EndSection

+EOF

+%end

diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 371ad17..65ffec6 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -1,3 +1,7 @@
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:fedora-desktop-list@redhat.com
+
 %include fedora-live-base.ks
 
 %packages
@@ -33,11 +37,17 @@ festvox-slt-arctic-hts
 scim-chewing
 scim-pinyin
 
+# Sendmail has slow startup and is in general not necessary -
+# long term we should evaluate dropping local SMTP entirely
+# and fix cron
+-sendmail
+ssmtp
+
 # save some space
 -gnome-user-docs
 -gimp-help
 -evolution-help
--autofs
+-gnome-games-help
 -nss_db
 -vino
 
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 1ca9eef..38d1131 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -11,12 +11,15 @@
 
 %packages
 
+# workaround to put it on the beta
+phonon-backend-xine
+
 @kde-desktop
 
 # unwanted packages from @kde-desktop
 # don't include these for now to fit on a cd
 
-### amarok has duplicate functionality with juk (~14 megs)
+### amarok has duplicate functionality with juk (~10 megs)
 #-amarok
 ### digikam has duplicate functionality with gwenview (~11 megs)
 -digikam
@@ -47,7 +50,8 @@ filelight
 
 # some extras
 fuse
-pavucontrol
+# nice to have but pulls in gstreamer
+#pavucontrol
 
 
 # additional fonts
diff --git a/fedora-livedvd-developer-pt_PT.ks b/fedora-livedvd-developer-pt_PT.ks
index 0775470..b217800 100644
--- a/fedora-livedvd-developer-pt_PT.ks
+++ b/fedora-livedvd-developer-pt_PT.ks
@@ -19,7 +19,7 @@ cat >>/etc/X11/xorg.conf << EOF
 Section "InputDevice"

     Identifier "Keyboard0"

     Driver "kbd"

-    Option "XkbLayout" "pt-latin1"

+    Option "XkbLayout" "pt"

 EndSection

 EOF

-%end
\ No newline at end of file
+%end

diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index 7a43065..59e9773 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -7,6 +7,9 @@
 
 %include fedora-livecd-kde.ks
 
+# DVD payload
+part / --size=8192
+
 %packages
 
 # KDE basic packages
@@ -58,7 +61,6 @@ gnome-bluetooth
 
 
 # ignore comps.xml and make sure these packages are included
-rhgb
 make
 # include default fedora wallpaper
 desktop-backgrounds-basic
diff --git a/fedora-livedvd-games-pt_PT.ks b/fedora-livedvd-games-pt_PT.ks
index d623cab..7a385a5 100644
--- a/fedora-livedvd-games-pt_PT.ks
+++ b/fedora-livedvd-games-pt_PT.ks
@@ -19,7 +19,7 @@ cat >>/etc/X11/xorg.conf << EOF
 Section "InputDevice"

     Identifier "Keyboard0"

     Driver "kbd"

-    Option "XkbLayout" "pt-latin1"

+    Option "XkbLayout" "pt"

 EndSection

 EOF

-%end
\ No newline at end of file
+%end