heavy content reorganization and clean ups after beta release

4 files changed, 93 insertions, 98 deletions

diff --git a/base.ks b/base.ks
index 574a73b..6261e83 100644
--- a/base.ks
+++ b/base.ks
@@ -86,6 +86,7 @@ xconfig --startxonboot
 -libselinux
 
 # other random stuff
+-PackageKit*
 -bluez*
 -samba*
 -*-backgrounds
diff --git a/olpc.ks b/olpc.ks
index e350286..d856c63 100644
--- a/olpc.ks
+++ b/olpc.ks
@@ -12,27 +12,17 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 # use if mirrors are outdated
 # repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=PolicyKit-kde
 
-# use static rawhide repo for now (equivalent to beta)
-# repo --name=rawhide --baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide-20090327/development/i386/os/ --excludepkgs=PolicyKit-kde
-
 %packages --excludedocs --instLangs en_US
 
-# double check this
-# @admin-tools
-# -system-config-lvm
+# basic system packages
 libertas-usb8388-firmware
 kernel.i586
 chkconfig
 
-# temporary changes
--PackageKit*
--fedora-release-notes
--smolt*
-
 # graphical base environment
 desktop-backgrounds-basic
 openssh-askpass
-plymouth-system-plugin
+plymouth-plugin-spinfinity
 xorg-x11-server-Xorg
 xorg-x11-drv-void
 xorg-x11-drv-fbdev
@@ -44,4 +34,8 @@ xorg-x11-drv-cirrus
 xorg-x11-utils
 xorg-x11-xinit
 xorg-x11-xauth
+
+# move to generic release notes
+-fedora-release-notes
+generic-release-notes
 %end
diff --git a/soas.ks b/soas.ks
index 0299566..68576d8 100644
--- a/soas.ks
+++ b/soas.ks
@@ -11,16 +11,17 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 # use if mirrors are outdated
 # repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
 
-# use static rawhide repo for now (equivalent to beta)
-# repo --name=rawhide --baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide-20090327/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
+# include soas repo
+repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/2/
 
 %packages
+
+# basic system packages
 @hardware-support
 kernel
 
-# display stuff
+# graphical base environment
 @base-x
--gnome-packagekit
 slim
 
 # work around for keyboard layout
@@ -50,6 +51,16 @@ EOF
 
 cat >> /etc/rc.d/init.d/livesys << EOF
 
+# add Sugar repository to yum
+cat >> /etc/yum.repos.d/sugar.repo << FOE
+[sugar]
+name=Sugar
+failovermethod=priority
+baseurl=http://download.sugarlabs.org/soas/repositories/2/
+enabled=1
+gpgcheck=0
+FOE
+
 # disable the logout menu item in Sugar
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
 
@@ -58,5 +69,76 @@ cat >> /etc/slim.conf << FOE
 auto_login	yes
 default_user	liveuser
 FOE
+
+# setup activity directory
+mkdir -p /home/liveuser/Activities
+chown liveuser:liveuser /home/liveuser/Activities
+chown -R liveuser:liveuser /usr/share/sugar/honey
+for bundle in \`find /usr/share/sugar/honey -maxdepth 1\` ; do
+ln -s \$bundle /home/liveuser/Activities
+done
+
+# add more activities to the favorites
+cat > /usr/share/sugar/data/activities.defaults << FOE
+com.garycmartin.Moon
+org.laptop.AbiWordActivity
+org.laptop.Calculate
+org.laptop.Chat
+org.sugarlabs.InfoSlicer
+org.sugarlabs.IRC
+org.laptop.Memorize
+org.laptop.Pippy
+org.laptop.Terminal
+org.laptop.TurtleArtActivity
+org.laptop.WebActivity
+org.vpri.EtoysActivity
+vu.lux.olpc.Speak
+org.worldwideworkshop.olpc.JigsawPuzzle
+FOE
+
 EOF
 %end
+
+%post --nochroot
+
+ASLO="$ASLO 4042" # InfoSlicer
+ASLO="$ASLO 4034" # Moon
+ASLO="$ASLO 4046" # JigsawPuzzle
+ASLO="$ASLO 4047" # SliderPuzzle
+ASLO="$ASLO 4063" # Memorize
+ASLO="$ASLO 4038" # Speak
+ASLO="$ASLO 4037" # CartoonBuilder
+ASLO="$ASLO 4044" # FlipSticks
+ASLO="$ASLO 4064" # JokeMachine
+ASLO="$ASLO 4029" # IRC
+ASLO="$ASLO 4054" # FreeCell
+ASLO="$ASLO 4039" # ViewSlides
+ASLO="$ASLO 4073" # StoryBuilder
+ASLO="$ASLO 4074" # Poll
+ASLO="$ASLO 4058" # Develop
+ASLO="$ASLO 4078" # Labyrinth
+ASLO="$ASLO 4082" # Paint
+ASLO="$ASLO 4081" # Record
+ASLO="$ASLO 4059" # TamTamEdit
+ASLO="$ASLO 4060" # TamTamJam
+ASLO="$ASLO 4061" # TamTamMini
+ASLO="$ASLO 4062" # TamTamSynth Lab
+
+WD=$PWD
+BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
+
+mkdir -p $BUNDLES_DIR
+cd $BUNDLES_DIR
+
+for id in $ASLO ; do
+  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
+done
+
+for file in *.xo ; do
+    unzip $file
+    rm $file
+done
+
+cd $WD
+
+%end
diff --git a/sugar.ks b/sugar.ks
index 1eec290..d019e46 100644
--- a/sugar.ks
+++ b/sugar.ks
@@ -1,5 +1,3 @@
-repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/2/
-
 %packages
 
 # sugar!
@@ -38,16 +36,6 @@ libffi
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
 
-# add Sugar repository to yum
-cat >> /etc/yum.repos.d/sugar.repo << FOE
-[sugar]
-name=Sugar
-failovermethod=priority
-baseurl=http://download.sugarlabs.org/soas/repositories/2/
-enabled=1
-gpgcheck=0
-FOE
-
 # fix permissions on home directory
 chown liveuser /home/liveuser
 chgrp liveuser /home/liveuser
@@ -74,76 +62,6 @@ rm /etc/X11/xinit/xinitrc.d/00-start-message-bus.sh
 chmod a+x /home/liveuser/.Xclients
 chown liveuser:liveuser /home/liveuser/.Xclients
 
-# setup activity directory
-mkdir -p /home/liveuser/Activities
-chown liveuser:liveuser /home/liveuser/Activities
-chown -R liveuser:liveuser /usr/share/sugar/honey
-for bundle in \`find /usr/share/sugar/honey -maxdepth 1\` ; do
-ln -s \$bundle /home/liveuser/Activities
-done
-
-# add more activities to the favorites
-cat > /usr/share/sugar/data/activities.defaults << FOE
-com.garycmartin.Moon
-org.laptop.AbiWordActivity
-org.laptop.Calculate
-org.laptop.Chat
-org.sugarlabs.InfoSlicer
-org.sugarlabs.IRC
-org.laptop.Memorize
-org.laptop.Pippy
-org.laptop.Terminal
-org.laptop.TurtleArtActivity
-org.laptop.WebActivity
-org.vpri.EtoysActivity
-vu.lux.olpc.Speak
-org.worldwideworkshop.olpc.JigsawPuzzle
-FOE
-
 EOF
 
 %end
-
-%post --nochroot
-
-ASLO="$ASLO 4042" # InfoSlicer
-ASLO="$ASLO 4034" # Moon
-ASLO="$ASLO 4046" # JigsawPuzzle
-ASLO="$ASLO 4047" # SliderPuzzle
-ASLO="$ASLO 4063" # Memorize
-ASLO="$ASLO 4038" # Speak
-ASLO="$ASLO 4037" # CartoonBuilder
-ASLO="$ASLO 4044" # FlipSticks
-ASLO="$ASLO 4064" # JokeMachine
-ASLO="$ASLO 4029" # IRC
-ASLO="$ASLO 4054" # FreeCell
-ASLO="$ASLO 4039" # ViewSlides
-ASLO="$ASLO 4073" # StoryBuilder
-ASLO="$ASLO 4074" # Poll
-ASLO="$ASLO 4058" # Develop
-ASLO="$ASLO 4078" # Labyrinth
-ASLO="$ASLO 4082" # Paint
-ASLO="$ASLO 4081" # Record
-ASLO="$ASLO 4059" # TamTamEdit
-ASLO="$ASLO 4060" # TamTamJam
-ASLO="$ASLO 4061" # TamTamMini
-ASLO="$ASLO 4062" # TamTamSynth Lab
-
-WD=$PWD
-BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
-
-mkdir -p $BUNDLES_DIR
-cd $BUNDLES_DIR
-
-for id in $ASLO ; do
-  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
-done
-
-for file in *.xo ; do
-    unzip $file
-    rm $file
-done
-
-cd $WD
-
-%end