Branch 'F-10' - 2 commits - configure.ac fedora-livedvd-electronic-lab.ks spin-kickstarts.spec.in

[Jeroen van Meeuwen]

configure.ac                     |    2 +-
 fedora-livedvd-electronic-lab.ks |   25 ++++++++++++++++++-------
 spin-kickstarts.spec.in          |    3 +++
 3 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 9fa4ab152350564fc54c1290e6c89ddde06cb724
Author: Chitlesh Goorah 
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) 
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