32 commits - AUTHORS configure.ac fedora-aos.ks fedora-live-base.ks fedora-livecd-electronic-lab-de_CH.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-livedvd-electronic-lab-de_CH.ks fedora-livedvd-electronic-lab-nl_NL.ks fedora-livedvd-electronic-lab-pt_PT.ks Makefile.am NEWS spin-kickstarts.spec.in

[Jeroen van Meeuwen]

 AUTHORS                                |   15 ++
 Makefile.am                            |   14 +
 NEWS                                   |    1 
 configure.ac                           |    7 
 fedora-aos.ks                          |   10 -
 fedora-live-base.ks                    |    8 -
 fedora-livecd-electronic-lab-de_CH.ks  |   17 --
 fedora-livecd-electronic-lab-nl_NL.ks  |   17 --
 fedora-livecd-electronic-lab-pt_PT.ks  |   17 --
 fedora-livecd-electronic-lab.ks        |  240 ---------------------------------
 fedora-livecd-kde-de_DE.ks             |   24 +++
 fedora-livedvd-electronic-lab-de_CH.ks |   17 ++
 fedora-livedvd-electronic-lab-nl_NL.ks |   17 ++
 fedora-livedvd-electronic-lab-pt_PT.ks |   17 ++
 spin-kickstarts.spec.in                |    5 
 15 files changed, 114 insertions(+), 312 deletions(-)

New commits:
commit 4a4a6fff946a9582e6087677212af3e995745c46
Merge: f8b542b... ceb2800...
Author: root <root(a)elwood.kanarip.com&gt;
Date:   Sun Nov 30 20:38:49 2008 +0100

    Merge branch 'F-10'
    
    Conflicts:
    
    	Makefile.am
    	configure.ac
    	fedora-live-base.ks
    	fedora-livecd-sugar.ks
    	spin-kickstarts.spec.in

diff --cc Makefile.am
index 2c8a794,a10d1aa..a866761
--- a/Makefile.am
+++ b/Makefile.am
@@@ -3,11 -3,12 +3,12 @@@
  kickstartdir = $(pkgdatadir)/
  kickstart_DATA = \
      fedora-aos.ks \
+     fedora-install-fedora.ks \
      fedora-live-base.ks \
 +    fedora-livecd-broffice.org.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.ks \
      fedora-livecd-desktop-nl_NL.ks \
      fedora-livecd-desktop-pt_BR.ks \
      fedora-livecd-desktop-pt_PT.ks \
diff --cc fedora-livecd-kde-de_DE.ks
index 8b5d5b2,6af425d..f0a2fcc
--- a/fedora-livecd-kde-de_DE.ks
+++ b/fedora-livecd-kde-de_DE.ks
@@@ -11,29 -11,31 +11,53 @@@ timezone Europe/Berli
  
  %packages
  @german-support
 +# exclude input methods
 +-m17n*
 +-scim*
 +
 +# don't use kpackagekit until it's translated
 +-kpackagekit
 +gnome-packagekit
 +
 +# 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
  
+ # 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
diff --cc fedora-livedvd-electronic-lab-de_CH.ks
index 0000000,b161006..9c8ce92
mode 000000,100644..100644
--- a/fedora-livedvd-electronic-lab-de_CH.ks
+++ b/fedora-livedvd-electronic-lab-de_CH.ks
@@@ -1,0 -1,14 +1,17 @@@
+ # fedora-livecd-electronic-lab-de_CH.ks
+ #
+ # Maintainer(s):
+ # - Fabian Affolter <fab a fedoraproject.org>
+ 
+ %include fedora-livedvd-electronic-lab.ks
+ 
+ lang de_DE
+ keyboard sg-latin1
+ timezone Europe/Zurich
+ 
+ %packages
+ @german-support
++# exclude input methods
++-m17n*
++-scim*
+ %end
diff --cc fedora-livedvd-electronic-lab-nl_NL.ks
index 0000000,7f9af01..fdf1c36
mode 000000,100644..100644
--- a/fedora-livedvd-electronic-lab-nl_NL.ks
+++ b/fedora-livedvd-electronic-lab-nl_NL.ks
@@@ -1,0 -1,14 +1,17 @@@
+ # fedora-livecd-electronic-lab-nl_NL.ks
+ #
+ # Maintainer(s):
+ # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
+ 
+ %include fedora-livedvd-electronic-lab.ks
+ 
+ lang nl_NL
+ keyboard us
+ timezone Europe/Amsterdam
+ 
+ %packages
+ @dutch-support
++# exclude input methods
++-m17n*
++-scim*
+ %end
diff --cc fedora-livedvd-electronic-lab-pt_PT.ks
index 0000000,754a736..edf624b
mode 000000,100644..100644
--- a/fedora-livedvd-electronic-lab-pt_PT.ks
+++ b/fedora-livedvd-electronic-lab-pt_PT.ks
@@@ -1,0 -1,14 +1,17 @@@
+ # 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
++# exclude input methods
++-m17n*
++-scim*
+ %end
diff --cc spin-kickstarts.spec.in
index c318991,e68c256..ec1840a
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@@ -34,9 -34,11 +34,14 @@@ rm -rf $RPM_BUILD_ROO
  
  %changelog
  * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
 +- Remove fedora-livecd-desktop-default.ks
 +
 +* Sat Nov 29 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.11.0-1
+ - Point fedora-live-base.ks repos to f-10
+ - Remove sysprof from fedora-livedvd-developer.ks
+ - Latest and final rebuild for Fedora 10
+ 
+ * Sat Nov 08 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.2-1
  - Package updates to kickstarts into F-10 package
  
  * Fri Nov 07 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.1-1


commit f8b542bfe8e3b3a5bc8da1080ff07dc405b5144e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Nov 30 20:14:48 2008 +0100

    Add fedora-livecd-broffice.org.ks to package

diff --git a/Makefile.am b/Makefile.am
index 7a7e9ab..2c8a794 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,7 @@ kickstartdir = $(pkgdatadir)/
 kickstart_DATA = \
     fedora-aos.ks \
     fedora-live-base.ks \
+    fedora-livecd-broffice.org.ks \
     fedora-livecd-desktop-de_DE.ks \
     fedora-livecd-desktop-en_US.ks \
     fedora-livecd-desktop.ks \


commit ee522306e5f14fa3bcd72e4e091268a6e5bf4e27
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sat Nov 29 22:14:13 2008 +0100

    Make the most recent repositories say 10 instead of 9

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index bdcb98a..b655e87 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -18,16 +18,16 @@ part / --size 3072
 services --enabled=NetworkManager --disabled=network,sshd
 
 # To compose against the current release tree, use the following "repo"
(enabled by default)
-#repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
+#repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-#repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
+#repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
 
 # To compose against rawhide, use the following "repo" (disabled by default)
 repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 # To compose against local trees, (edit and) use:
-#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/
-#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/
+#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
+#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
 
 %packages
 @base-x


commit ceb2800be84239c1474b739dc20771148d8e6766
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Thu Nov 20 00:26:19 2008 +0100

    Bump release

diff --git a/configure.ac b/configure.ac
index 746c42c..d989ab4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([spin-kickstarts], 0.10.3)
-AC_SUBST([RELEASE], 2)
+AC_SUBST([RELEASE], 3)
 
 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"
 
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 37ecc0f..e68c256 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -34,6 +34,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Point fedora-live-base.ks repos to f-10
 - Remove sysprof from fedora-livedvd-developer.ks
 - Latest and final rebuild for Fedora 10
 


commit d3548e6e1c0af5fef8ee13251e2451346902f20e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Thu Nov 20 00:26:07 2008 +0100

    Set default repository config to f10

diff --git a/fedora-aos.ks b/fedora-aos.ks
index ed8de4f..884fee0 100644
--- a/fedora-aos.ks
+++ b/fedora-aos.ks
@@ -27,16 +27,16 @@ part / --size 550 --fstype ext3 --ondisk sda
 # Repositories
 #
 # To compose against the current release tree, use the following "repo"
(enabled by default)
-#repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
+repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-#repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
+repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
 
 # To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 # To compose against local trees, (edit and) use:
-#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/
-#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/
+#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
+#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
 
 #
 # Add all the packages after the base packages
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 4708e40..5f51f1a 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -18,16 +18,16 @@ part / --size 3072
 services --enabled=NetworkManager --disabled=network,sshd
 
 # To compose against the current release tree, use the following "repo"
(enabled by default)
-#repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-9&arch=$basearch
+repo --name=released
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=$basearch
 # To include updates, use the following "repo" (enabled by default)
-#repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f9&arch=$basearch
+repo --name=updates
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=$basearch
 
 # To compose against rawhide, use the following "repo" (disabled by default)
-repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+#repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 
 # To compose against local trees, (edit and) use:
-#repo --name=f9 --baseurl=http://localrepo/fedora/releases/9/Everything/$basearch/os/
-#repo --name=f9-updates --baseurl=http://localrepo/fedora/updates/9/$basearch/
+#repo --name=f10 --baseurl=http://localrepo/fedora/releases/10/Everything/$basearch/os/
+#repo --name=f10-updates --baseurl=http://localrepo/fedora/updates/10/$basearch/
 
 %packages
 @base-x


commit f918eab54606fa7f38aaaceaf485297352d08b53
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Thu Nov 20 00:24:34 2008 +0100

    Bump version

diff --git a/configure.ac b/configure.ac
index b144992..746c42c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([spin-kickstarts], 0.10.3)
-AC_SUBST([RELEASE], 1)
+AC_SUBST([RELEASE], 2)
 
 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"
 
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 273f7cb..37ecc0f 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -34,6 +34,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Remove sysprof from fedora-livedvd-developer.ks
 - Latest and final rebuild for Fedora 10
 
 * Sat Nov 08 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.2-1


commit 73d549965ef1e6a2f7db423928f9a77cae73439b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Thu Nov 20 00:21:36 2008 +0100

    Remove sysprof from fedora-livedvd-developer.ks

diff --git a/fedora-livedvd-developer.ks b/fedora-livedvd-developer.ks
index 483fb44..d1c150e 100644
--- a/fedora-livedvd-developer.ks
+++ b/fedora-livedvd-developer.ks
@@ -55,7 +55,6 @@ scons
 sharutils
 socat
 sox
-sysprof
 tcp_wrappers-devel
 tcsh
 texi2html


commit 073c6eac05ece0175f70f7a6ccc04f87a08e8a75
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Thu Nov 20 00:21:15 2008 +0100

    Bump version

diff --git a/configure.ac b/configure.ac
index 47f9338..b144992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.10.2)
+AC_INIT([spin-kickstarts], 0.10.3)
 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"
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index 0fbf9aa..273f7cb 100644
--- a/spin-kickstarts.spec.in
+++ b/spin-kickstarts.spec.in
@@ -34,6 +34,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@
+- Latest and final rebuild for Fedora 10
+
+* Sat Nov 08 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.2-1
 - Package updates to kickstarts into F-10 package
 
 * Fri Nov 07 2008 Jeroen van Meeuwen <kanarip a fedoraunity.org> 0.10.1-1


commit 0320a33a2c2eb8dc4f29535bac88fa9f54161b88
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Thu Nov 13 13:16:56 2008 +0100

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

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 85c0689..7a99384 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -15,6 +15,9 @@
 kpackagekit
 -gnome-packagekit
 
+# make sure /usr/bin/pactl is there (#466544)
+pulseaudio-utils
+
 @kde-desktop
 
 # unwanted packages from @kde-desktop
@@ -57,6 +60,9 @@ liveusb-creator
 pavucontrol
 konq-plugins
 kde-plasma-lancelot
+# make sure alsaunmute is there
+alsa-utils
+
 
 # additional fonts
 @fonts


commit 4dc334f28c51047240c6c841b33c3da91205351d
Author: Chitlesh Goorah <chitlesh(a)localhost.localdomain&gt;
Date:   Sat Nov 15 17:24:09 2008 +0100

    dropped libflashsupport as it is blocked from F-10

diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index 99ea986..afb7171 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -13,7 +13,6 @@ part / --size=8192
 %packages
 
 # KDE basic packages
-kmenu-gnome
 kdesvn
 yakuake
 kdebluetooth
@@ -55,7 +54,6 @@ syslinux
 gnupg
 hal-cups-utils
 firefox
-libflashsupport
 bluez-gnome
 gnome-bluetooth
 
@@ -140,6 +138,7 @@ qemu
 # computing
 octave
 octave-forge
+qtoctave
 
 # Oracle Berkeley database
 db4-cxx
@@ -148,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


commit ab1c6a8b9c91a10e7431be5099de6e127e4e7233
Author: Chitlesh Goorah <chitlesh(a)localhost.localdomain&gt;
Date:   Sat Nov 15 17:25:36 2008 +0100

    changed date

diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index 73563b5..99ea986 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -1,5 +1,5 @@
 # Description : Live DVD image for Fedora Electronic Lab
-# last updated: 09 November 2008 - ready for F10 Cambridge.
+# last updated: 15 November 2008 - ready for F10 Cambridge.
 #
 # Maintainer(s):
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>


commit 9fa4ab152350564fc54c1290e6c89ddde06cb724
Author: Chitlesh Goorah <chitlesh(a)localhost.localdomain&gt;
Date:   Sun Nov 9 19:23:52 2008 +0100

    updated to livesys mechanism

diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index 0076e13..73563b5 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -1,5 +1,5 @@
 # Description : Live DVD image for Fedora Electronic Lab
-# last updated: 10 August 2008
+# last updated: 09 November 2008 - ready for F10 Cambridge.
 #
 # Maintainer(s):
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>
@@ -25,7 +25,7 @@ kdebluetooth
 -koffice-kspread
 -koffice-kpresenter
 -koffice-filters
-
+-kdeedu-kstars
 
 # some projects based on ghdl and gtkwave needs
 zlib-devel
@@ -130,6 +130,12 @@ avrdude
 dfu-programmer
 avarice
 uisp
+# debugging tools
+gdb
+valgrind
+kdbg
+wireshark-gnome
+qemu
 
 # computing
 octave
@@ -150,15 +156,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
+
+chown liveuser:liveuser /home/liveuser/.kde/share/config/klipperrc
 
-cat > /home/liveuser/.kde/share/config/kxkbrc <<EOF
+cat > /home/liveuser/.kde/share/config/kxkbrc << KXKBRC_EOF
 [Layout]
 DisplayNames=us,ch,de,fr
 IndicatorOnly=false
@@ -170,7 +178,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 +192,6 @@ EOF
 /sbin/chkconfig rpcidmapd off 2>/dev/null
 /sbin/chkconfig rpcbind   off 2>/dev/null
 
+EOF
 
 %end


commit 38222a576d75d1f47752c18047357002817abee1
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Sun Nov 9 21:37:56 2008 +0100

    Update version

diff --git a/configure.ac b/configure.ac
index 6645ba3..47f9338 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([spin-kickstarts], 0.10.1)
+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"
diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in
index dfaabd3..0fbf9aa 100644
--- a/spin-kickstarts.spec.in
+++ b/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


commit 5c836f6352eade439b64d3197d2279702c4fd88d
Author: Jesse Keating <jkeating(a)redhat.com&gt;
Date:   Fri Nov 7 14:27:47 2008 -0800

    The exclude didn't look right, got an extra + in there somehow.

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 6d3c7cc..80d2293 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -62,7 +62,7 @@ wireshark-gnome
 @sql-server
 @web-server --optional
 # Keep dap off the install media, makes Eng & Sci show up
-+-dap-server-cgi
+-dap-server-cgi
 # Virt group
 @virtualization --optional
 # filesystem stuff


commit a05e9932f128ef2fc249c01c8f8d140320d351ab
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Wed Nov 5 13:08:07 2008 +0100

    add kde-plasma-lancelot

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 9e253c8..85c0689 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -24,8 +24,9 @@ kpackagekit
 #-amarok
 ### digikam has duplicate functionality with gwenview (~11 megs)
 #-digikam
-### kdeedu is too big for the live images
+### 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)
@@ -47,8 +48,6 @@ k3b
 filelight
 # twinkle (~10 megs)
 twinkle
-konq-plugins
-kdeedu-kstars
 
 
 # some extras
@@ -56,7 +55,8 @@ fuse
 liveusb-creator
 # nice to have but pulls in gstreamer (~3 megs)
 pavucontrol
-
+konq-plugins
+kde-plasma-lancelot
 
 # additional fonts
 @fonts


commit d0aa55225372f64e2033d52fe67da9c2320ad4bc
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Mon Nov 3 15:50:59 2008 +0100

    the inclusion of input-methods was postboned for F11, so remove the replacement for
scim-python-pinyin also from this kickstart to make sure that scim won't end up on the
KDE live images; add twinkle as additional package

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 389dd0a..9e253c8 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -46,7 +46,7 @@ koffice-filters
 k3b
 filelight
 # twinkle (~10 megs)
-#twinkle
+twinkle
 konq-plugins
 kdeedu-kstars
 
@@ -78,11 +78,6 @@ pavucontrol
 -nss_db
 -autofs
 
-# save some space (from @input-methods)
--scim-python-pinyin
-scim-pinyin
-
-
 %end
 
 %post


commit 59869f2b0956cbc5618238f9d2c946deeb6d548b
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Thu Nov 6 13:32:52 2008 -0500

    Ensure we mount persistent home and swap always (#470317)
    
    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

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 22971ad..4708e40 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -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
 


commit 45878133367e98caf007c445b37dfcd0a532f16d
Author: Jesse Keating <jkeating(a)redhat.com&gt;
Date:   Wed Nov 5 18:53:29 2008 -0800

    Exclude the dap-server-cgi package.  This was making the Engineering
    and Science group show up for just this one package.

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 82a09b3..6d3c7cc 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -61,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


commit d36fbc1acb23e232fd53c3910b73c291c3538bb0
Author: Jesse Keating <jkeating(a)redhat.com&gt;
Date:   Wed Nov 5 18:52:59 2008 -0800

    Add the fedora-packager group.  It was showing up anyway due to shared
    packages, and it's useful to have with the other dev packages.

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 6cef039..82a09b3 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -44,6 +44,7 @@ wireshark-gnome
 # Devel packages
 @development-libs
 @development-tools
+@fedora-packager
 @gnome-software-development
 @java-development
 @kde-software-development


commit f9e7d855f5e65ae59f5187b5e9ea9b6f1ea1de6a
Author: Jesse Keating <jkeating(a)redhat.com&gt;
Date:   Wed Nov 5 18:52:22 2008 -0800

    The default size is now 695 instead of 670.

diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index 1014307..6cef039 100644
--- a/fedora-install-fedora.ks
+++ b/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
 


commit 587e6d3dfb838a95a72a65ad2dd69c7872d0114f
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Mon Nov 3 08:42:37 2008 +0100

    Revert "Install input methods by default."
    
    This reverts commit bd870f59d70eacb0362462976444381a7924f067.

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 7531747..22971ad 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -34,7 +34,6 @@ repo --name=rawhide
--mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 @base
 @core
 @fonts
-@input-methods
 @admin-tools
 @dial-up
 @hardware-support


commit e7e6899a30be56aa9c0900ede9db6d58e3977fbb
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Fri Oct 31 01:32:02 2008 +0100

    the removal/split of solar-backgrounds has freed some space. So there is some place
for more addon packages: digikam, konq-plugins, pavucontrol, kdeedu-kstars

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index 7f09b90..389dd0a 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -23,7 +23,7 @@ kpackagekit
 ### amarok has duplicate functionality with juk (~10 megs)
 #-amarok
 ### digikam has duplicate functionality with gwenview (~11 megs)
--digikam
+#-digikam
 ### kdeedu is too big for the live images
 -kdeedu
 ### scribus is too big for the live images
@@ -47,13 +47,15 @@ k3b
 filelight
 # twinkle (~10 megs)
 #twinkle
+konq-plugins
+kdeedu-kstars
 
 
 # some extras
 fuse
 liveusb-creator
-# nice to have but pulls in gstreamer
-#pavucontrol
+# nice to have but pulls in gstreamer (~3 megs)
+pavucontrol
 
 
 # additional fonts


commit 711eac0836c1da682c025826537e4f889a150590
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Fri Oct 31 15:07:40 2008 -0400

    Switch to using greedy migration heuristic for geode (#462531, #467762)
    
    The geode driver seems to have some bugs that using the greedy migration
    heuristic works around (discovered in upstream
    https://bugs.freedesktop.org/show_bug.cgi?id=15700).  This fixes both the
    black boxes we see on XO and also seems to make the text appear properly.

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 7156832..7531747 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -322,6 +322,7 @@ Section "Device"
 
 	Option     "AccelMethod" "EXA"
 	Option     "NoCompression" "true"
+        Option     "MigrationHeuristic" "greedy"
 	Option     "PanelGeometry" "1200x900"
 EndSection
 


commit 7b5158766db4d2d3ecd1bcf2df7fa6a6751c7f7d
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Tue Oct 28 20:27:07 2008 +0100

    replace scim-python-pinyin with scim-pinyin for size issues

diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index db0f13c..7f09b90 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -11,9 +11,6 @@
 
 %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
@@ -79,6 +76,11 @@ liveusb-creator
 -nss_db
 -autofs
 
+# save some space (from @input-methods)
+-scim-python-pinyin
+scim-pinyin
+
+
 %end
 
 %post


commit 337855a64797824236116875710d9f9fa07bfd6e
Author: Sebastian Vahl <fedora(a)deadbabylon.de&gt;
Date:   Wed Oct 29 13:45:46 2008 +0100

    don't install unnecessary input-methods and fonts to save spae; remove the
workaround for adding the german keyboard layout inside KDE

diff --git a/fedora-livecd-kde-de_DE.ks b/fedora-livecd-kde-de_DE.ks
index e14e217..6af425d 100644
--- a/fedora-livecd-kde-de_DE.ks
+++ b/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
\ No newline at end of file
+%end


commit 9684f9bbb6bc31d110e1746549065ea638aa8d0c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 14:49:21 2008 +0100

    Add fedora-install-fedora.ks to package

diff --git a/Makefile.am b/Makefile.am
index 5c9561b..a10d1aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 kickstartdir = $(pkgdatadir)/
 kickstart_DATA = \
     fedora-aos.ks \
+    fedora-install-fedora.ks \
     fedora-live-base.ks \
     fedora-livecd-desktop.ks \
     fedora-livecd-desktop-default.ks \


commit 2e3cc48e8bb3638c1e1641a5f544fee7ce7ebb0e
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 14:47:53 2008 +0100

    Remove fedora-livecd-sugar which has not been approved for F-10

diff --git a/fedora-livecd-sugar.ks b/fedora-livecd-sugar.ks
deleted file mode 100644
index 6146533..0000000
--- a/fedora-livecd-sugar.ks
+++ /dev/null
@@ -1,198 +0,0 @@
-# Filename:
-#   fedora-livecd-sugar.ks
-# Maintainers:
-#   Sebastian Dziallas <sdz AT fedoraproject DOT org>
-
-%include fedora-live-base.ks
-
-%packages
-
-# sugar!
-@sugar-desktop
-
-# 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


commit 4aba382eccdff4d633a55148eaf8ca537533346c
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 13:43:35 2008 +0100

    Clean configure.ac

diff --git a/configure.ac b/configure.ac
index ba0a951..6645ba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,13 +6,6 @@ ALL_LINGUAS="bn_IN bn ca cs da de el es fi fr gl gu hi hr hu is it
ja ko ml ms n
 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([


commit 5b4d78bbb21ec7162763b1ddcd8d44d8701ea184
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 13:42:44 2008 +0100

    Bump version (for real this time)

diff --git a/configure.ac b/configure.ac
index 602af69..ba0a951 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([spin-kickstarts], 0.01)
-AC_SUBST([RELEASE], 2)
+AC_INIT([spin-kickstarts], 0.10.1)
+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"
 


commit 684f924a724ae5cd13ae6043ee32bc651e60af24
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 13:38:39 2008 +0100

    There is no Electronic Lab LiveCD anymore, make the changes
    Sort the Makefile to list the actual spin first, then it's localizations

diff --git a/Makefile.am b/Makefile.am
index bd13d23..5c9561b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,28 +4,30 @@ kickstartdir = $(pkgdatadir)/
 kickstart_DATA = \
     fedora-aos.ks \
     fedora-live-base.ks \
-    fedora-livecd-desktop-de_DE.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.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
diff --git a/fedora-livecd-electronic-lab-de_CH.ks
b/fedora-livecd-electronic-lab-de_CH.ks
deleted file mode 100644
index a2456f6..0000000
--- a/fedora-livecd-electronic-lab-de_CH.ks
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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-electronic-lab-nl_NL.ks
b/fedora-livecd-electronic-lab-nl_NL.ks
deleted file mode 100644
index c623ca5..0000000
--- a/fedora-livecd-electronic-lab-nl_NL.ks
+++ /dev/null
@@ -1,14 +0,0 @@
-# fedora-livecd-electronic-lab-nl_NL.ks
-#
-# Maintainer(s):
-# - Jeroen van Meeuwen <kanarip a fedoraunity.org>
-
-%include fedora-livecd-electronic-lab.ks
-
-lang nl_NL
-keyboard us
-timezone Europe/Amsterdam
-
-%packages
-@dutch-support
-%end
diff --git a/fedora-livecd-electronic-lab-pt_PT.ks
b/fedora-livecd-electronic-lab-pt_PT.ks
deleted file mode 100644
index 823d72c..0000000
--- a/fedora-livecd-electronic-lab-pt_PT.ks
+++ /dev/null
@@ -1,14 +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
diff --git a/fedora-livecd-electronic-lab.ks b/fedora-livecd-electronic-lab.ks
deleted file mode 100644
index 5b15e45..0000000
--- a/fedora-livecd-electronic-lab.ks
+++ /dev/null
@@ -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
-
diff --git a/fedora-livedvd-electronic-lab-de_CH.ks
b/fedora-livedvd-electronic-lab-de_CH.ks
new file mode 100644
index 0000000..b161006
--- /dev/null
+++ b/fedora-livedvd-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-livedvd-electronic-lab.ks
+
+lang de_DE
+keyboard sg-latin1
+timezone Europe/Zurich
+
+%packages
+@german-support
+%end
diff --git a/fedora-livedvd-electronic-lab-nl_NL.ks
b/fedora-livedvd-electronic-lab-nl_NL.ks
new file mode 100644
index 0000000..7f9af01
--- /dev/null
+++ b/fedora-livedvd-electronic-lab-nl_NL.ks
@@ -0,0 +1,14 @@
+# fedora-livecd-electronic-lab-nl_NL.ks
+#
+# Maintainer(s):
+# - Jeroen van Meeuwen <kanarip a fedoraunity.org>
+
+%include fedora-livedvd-electronic-lab.ks
+
+lang nl_NL
+keyboard us
+timezone Europe/Amsterdam
+
+%packages
+@dutch-support
+%end
diff --git a/fedora-livedvd-electronic-lab-pt_PT.ks
b/fedora-livedvd-electronic-lab-pt_PT.ks
new file mode 100644
index 0000000..754a736
--- /dev/null
+++ b/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


commit 19665545c31383533da62d2b92d10d7146e9aa62
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 13:36:52 2008 +0100

    List AUTHORS

diff --git a/AUTHORS b/AUTHORS
index e69de29..6ea6110 100644
--- a/AUTHORS
+++ b/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


commit 28b35d7538d3ae52d82688366e55a944beea6b40
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org&gt;
Date:   Tue Oct 28 13:34:16 2008 +0100

    List our upstream project URL in NEWS

diff --git a/NEWS b/NEWS
index e69de29..fb88a73 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1 @@
+Most news is on http://fedorahosted.org/spin-kickstarts