making cloud images is easier if we include the base

Revert "This makes compsoes blow up so need to revert"

This reverts commit e853d96f22.

Makefile

@@ -1,9 +1,5 @@
-# Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
-# And if it wasn't use a git hash
-ifeq ($(version),)
-  version := $(shell git log -1 --abbrev=8 --pretty=git%h)
-endif
+# Get a version name based off the nearest tag (include lightweight tags)
+version := $(shell git describe --tags)
 
 DESTDIR := /usr
 

custom/qa-test-day.ks

@@ -135,29 +135,14 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
 # Remove anaconda welcome screen (if it exists), it would display instead of ours
 rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
 
-# Change Firefox start page to open Test Day wiki and IRC chat
-# (and a few more properties)
-mkdir /tmp/firefox
-unzip /usr/lib*/firefox/browser/omni.ja -d /tmp/firefox
-
-cat << FOE > /tmp/firefox/chrome/en-US/locale/branding/browserconfig.properties
-browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day
-FOE
-
-cat << FOE >> /tmp/firefox/defaults/preferences/firefox-branding.js
+PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
+cat << FOE >> $PREFDIR/test-day.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day");
 FOE
 
-# We need to re-zip the whole archive (instead of just updating files), because
-# the original archive is "Firefox optimized" and updating doesn't work
-# https://bugzilla.mozilla.org/show_bug.cgi?id=605524
-OMNIJA=`ls /usr/lib*/firefox/browser/omni.ja`
-rm -f $OMNIJA
-(cd /tmp/firefox; zip -r -0 $OMNIJA *)
-rm -rf /tmp/firefox
-
 # Adjust launchers in dash using a vendor override. (Adding a profile would
 # be another way to do this.)
 cat << FOE >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override

fedora-arm-base.ks

@@ -5,7 +5,7 @@ selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
 # configure extlinux bootloader
-bootloader extlinux
+bootloader --extlinux
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -23,6 +23,8 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae
 
+dracut-config-generic
+
 chrony
 arm-boot-config
 extlinux-bootloader
@@ -30,6 +32,9 @@ initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
 
+# remove this in %post
+dracut-config-generic
+
 # install uboot images
 uboot-beagle
 uboot-beaglebone
@@ -51,5 +56,8 @@ echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 
 /usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic
+
 %end
 

fedora-cloud-base.ks

@@ -0,0 +1,236 @@
+# This is a basic Fedora 20 spin designed to work in OpenStack and other
+# private cloud environments. It's configured with cloud-init so it will
+# take advantage of ec2-compatible metadata services for provisioning ssh
+# keys. Cloud-init creates a user account named "fedora" with passwordless
+# sudo access. The root password is empty and locked by default.
+#
+# Note that unlike the standard F20 install, this image has /tmp on disk
+# rather than in tmpfs, since memory is usually at a premium.
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20.
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --enablemd5
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+# this is actually not used, but a static firewall
+# matching these rules is generated below.
+firewall --service=ssh
+
+bootloader --timeout=1 --append="console=ttyS0,115200n8 console=tty0" extlinux
+
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network,sshd,rsyslog,iptables,cloud-init,cloud-init-local,cloud-config,cloud-final
+
+
+zerombr
+clearpart --all
+part / --size 2048 --fstype ext4
+
+%include fedora-repo.ks
+
+
+reboot
+
+# Package list.
+%packages
+@core
+grubby
+
+# cloud-init does magical things with EC2 metadata, including provisioning
+# a user account with ssh keys.
+cloud-init
+
+# this is used by openstack's cloud orchestration framework (and it's small)
+heat-cfntools
+
+# need this for growpart, because parted doesn't yet support resizepart
+# https://bugzilla.redhat.com/show_bug.cgi?id=966993
+cloud-utils-growpart
+
+# We need this image to be portable; also, rescue mode isn't useful here.
+dracut-config-generic
+-dracut-config-rescue
+
+syslinux-extlinux 
+
+# Needed initially, but removed below.
+firewalld
+
+# Basic firewall. If you're going to rely on your cloud service's
+# security groups you can remove this.
+iptables-services
+
+# cherry-pick a few things from @standard
+tar
+rsync
+
+# Some things from @core we can do without in a minimal install
+-biosdevname
+-plymouth
+-NetworkManager
+-iprutils
+-kbd
+
+%end
+
+
+
+%post --erroronfail
+
+# Create grub.conf for EC2. This used to be done by appliance creator but
+# anaconda doesn't do it. And, in case appliance-creator is used, we're
+# overriding it here so that both cases get the exact same file.
+# Note that the console line is different -- that's because EC2 provides
+# different virtual hardware, and this is a convenient way to act differently
+echo -n "Creating grub.conf for pvgrub"
+rootuuid=$( awk '$2=="/" { print $1 };'  /etc/fstab )
+mkdir /boot/grub
+echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
+for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-//  ); do
+  echo "title Fedora ($kv)" >> /boot/grub/grub.conf
+  echo -e "\troot (hd0)" >> /boot/grub/grub.conf
+  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+  echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
+  echo
+done
+
+
+#link grub.conf to menu.lst for ec2 to work
+echo -n "Linking menu.lst to old-style grub.conf for pv-grub"
+ln -sf grub.conf /boot/grub/menu.lst
+ln -sf /boot/grub/grub.conf /etc/grub.conf
+
+# older versions of livecd-tools do not follow "rootpw --lock" line above
+# https://bugzilla.redhat.com/show_bug.cgi?id=964299
+passwd -l root
+
+# Kickstart specifies timeout in seconds; syslinux uses 10ths.
+# 0 means wait forever, so instead we'll go with 1.
+sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+# If you want to remove rsyslog and just use journald, remove this!
+echo -n "Disabling persistent journal"
+rmdir /var/log/journal/ 
+echo . 
+
+# this is installed by default but we don't need it in virt
+echo "Removing linux-firmware package."
+yum -C -y remove linux-firmware
+
+# Remove firewalld; was supposed to be optional in F18+, but is required to
+# be present for install/image building.
+echo "Removing firewalld."
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+# Non-firewalld-firewall
+echo -n "Writing static firewall"
+cat <<EOF > /etc/sysconfig/iptables
+# Simple static firewall loaded by iptables.service. Replace
+# this with your own custom rules, run lokkit, or switch to 
+# shorewall or firewalld as your needs dictate.
+*filter
+:INPUT ACCEPT [0:0]
+:FORWARD ACCEPT [0:0]
+:OUTPUT ACCEPT [0:0]
+-A INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
+-A INPUT -p icmp -j ACCEPT
+-A INPUT -i lo -j ACCEPT
+-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 80 -j ACCEPT
+#-A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 443 -j ACCEPT
+-A INPUT -j REJECT --reject-with icmp-host-prohibited
+-A FORWARD -j REJECT --reject-with icmp-host-prohibited
+COMMIT
+EOF
+echo .
+
+# Another one needed at install time but not after that, and it pulls
+# in some unneeded deps (like, newt and slang)
+echo "Removing authconfig."
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+
+echo -n "Getty fixes"
+# although we want console output going to the serial console, we don't
+# actually have the opportunity to login there. FIX.
+# we don't really need to auto-spawn _any_ gettys.
+sed -i '/^#NAutoVTs=.*/ a\
+NAutoVTs=0' /etc/systemd/logind.conf
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+# Uncomment this if you want to use cloud init but suppress the creation
+# of an "ec2-user" account. This will, in the absence of further config,
+# cause the ssh key from a metadata source to be put in the root account.
+#cat <<EOF > /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg
+#users: []
+#disable_root: 0
+#EOF
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+echo "Cleaning old yum repodata."
+yum history new
+yum clean all
+truncate -c -s 0 /var/log/yum.log
+
+echo "Fixing SELinux contexts."
+/usr/sbin/fixfiles -R -a restore
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+%end
+

fedora-i386-cloud.ks

@@ -0,0 +1,20 @@
+%include fedora-cloud-base.ks
+
+# Package list.
+%packages
+kernel-PAE
+
+%end
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel-PAE
+EOF
+fi
+%end

fedora-install-fedora.ks

@@ -144,6 +144,7 @@ kde-l10n-*
 libreoffice-langpack-*
 man-pages-*
 mythes-*
+-gimp-help-*
 
 # Removals
 -PackageKit-zif

fedora-live-base.ks

@@ -280,7 +280,7 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted

fedora-live-design-suite.ks

@@ -27,6 +27,7 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
@@ -39,6 +40,7 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
+simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -55,10 +57,6 @@ filezilla
 audacity
 pitivi
 
-# system
-# gtk-recordmydesktop # dropped for space (#887991)
-# network-manager-applet #part of Gnome Desktop
-
 # fonts
 aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
@@ -71,7 +69,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
-
+-rdesktop
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -118,6 +116,29 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
+<<<<<<< HEAD
+# Add link to lists of tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=List of design tutorials
+Comment=Reference of design related tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+=======
+# Add link to the list of design tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+>>>>>>> 6aa8533f0e92ff46ad7952e5cbd11458bad3d7fa
+Type=Application
+Icon=applications-graphics
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/list-design-tutorials.desktop
+
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-jam-kde.ks

@@ -33,6 +33,7 @@ alsa-plugins-samplerate
 alsa-plugins-upmix
 alsa-plugins-vdownmix
 a2jmidid
+aj-snapshot
 
 #jack 
 jack-audio-connection-kit
@@ -81,6 +82,9 @@ seq24
 muse
 qtractor
 non-session-manager
+non-daw
+non-sequencer
+non-mixer
 
 # audio-plugins
 calf
@@ -118,6 +122,8 @@ lv2-synthv1
 lv2-drumkv1
 lv2-triceratops
 lv2-newtonator
+lv2-x42-plugins
+lv2-fomp-plugins
 
 #dssi
 nekobee-dssi

fedora-live-kde-base.ks

@@ -40,12 +40,11 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
+sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
 
 # set up user liveuser 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
+sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
 
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/

fedora-live-kde.ks

@@ -28,7 +28,6 @@ calligra
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
-#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
 # kdeedu apps

fedora-livecd-desktop.ks

@@ -14,6 +14,10 @@
 -libreoffice-emailmerge
 -libreoffice-math
 
+# remove some other applications
+-gnome-boxes
+-gnome-dictionary
+
 # remove input method things we don't need
 -ibus-typing-booster
 -imsettings
@@ -31,6 +35,9 @@
 -foomatic-db-ppds
 -foomatic
 
+# we don't want prelink
+-prelink
+
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
 # strong preference to giving it a go on #fedora-desktop.
@@ -90,6 +97,8 @@
 -gnu-free-mono-fonts
 -gnu-free-sans-fonts
 -gnu-free-serif-fonts
+-uboot-tools
+-dtc
 
 # Without gnu freefonts, the lack of Malayalam coverage is
 # a problem in anaconda (#977764)

fedora-livecd-kde.ks

@@ -38,7 +38,6 @@ calligra-stage			# ~3 megs
 #twinkle			# (~10 megs)
 fuse
 liveusb-creator
-#kaffeine*			# kaffeine has duplicate functionality with dragonplayer (~3 megs)
 
 # only include kdegames-minimal
 -kdegames

fedora-livecd-mate-compiz.ks

@@ -11,9 +11,27 @@
 -planner
 
 # Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-@dial-up
+-dnf
 -firefox
+-gnome-bluetooth-libs
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-user-docs
+-@guest-desktop-agents
 -@libreoffice
+-@mate-applications
+-mate-bluetooth
 -mate-icon-theme-faenza
+-transmission-gtk
+
+# Drop oversized fonts that aren't needed
+-cjkuni-uming-fonts
+-wqy-zenhei-fonts
 
 # A web browser would be nice for a live cd
 midori
@@ -66,8 +84,8 @@ midori
 -ntsysv
 
 # Drop some system-config things
--system-config-boot
 -system-config-language
+-system-config-printer
 -system-config-rootpassword
 -system-config-services
 -policycoreutils-gui
@@ -79,4 +97,3 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 %end
-

fedora-livecd-security.ks

@@ -18,18 +18,20 @@
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 
+# spin was failing to compose due to lack of space, so bumping the size.
+part / --size 10240
+
 %packages
 @xfce-desktop
 @xfce-apps
-#@xfce-extra-plugins
-#@xfce-media
-#@xfce-office
-#@firefox
 
 # Security tools (not ready at the moment)
 @security-lab
 security-menus
 
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+
 # save some space
 -autofs
 -acpid
@@ -38,6 +40,12 @@ security-menus
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
+-gnumeric
+-foomatic-db-ppds
+-foomatic
+-stix-fonts
+-ibus-typing-booster
+-xfce4-sensors-plugin
 -man-pages-*
 
 # drop some system-config things
@@ -50,14 +58,25 @@ security-menus
 # exclude some packages to save some space
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
+-aide
+-binwalk
+-bkhive
 -bonesi
+-bro
 -cmospwd
 -dnstop
+-etherape
 -hfsutils
--honeyd
+-httpie
+-httrack
+-hydra
 -kismon
+-labrea
+-nebula
 -netsed
 -onesixtyone
+-packETH
+-pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
@@ -66,8 +85,11 @@ security-menus
 -proxychains
 -pyrit
 -raddump
+-rkhunter
 -safecopy
+-samdump2
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay

fedora-livecd-soas.ks

@@ -51,6 +51,7 @@ org.laptop.StopWatchActivity
 org.laptop.community.Finance
 org.laptop.community.TypingTurtle
 org.laptop.sugar.Jukebox
+org.eq.FotoToon
 org.gnome.Labyrinth
 com.laptop.Ruler
 org.sugarlabs.AbacusActivity
@@ -83,6 +84,16 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # Enable Sugar power management
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 
+cat >> /etc/rc.d/init.d/livesys << EOF
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
 cat >> /etc/rc.d/init.d/livesys-late << EOF
 
 # disable screensaver locking

fedora-livedvd-electronic-lab.ks

@@ -7,7 +7,7 @@
 %include fedora-livecd-desktop.ks
 
 # DVD payload
-part / --size=8192
+part / --size 10240
 
 %packages
 
@@ -49,7 +49,8 @@ perl-Test-Pod-Coverage
 -gimp-libs
 -gimp-data-extras
 -kdebluetooth
-
+-kbluetooth
+-rdesktop
 
 %end
 

fedora-livedvd-scientific-kde.ks

@@ -10,12 +10,10 @@
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 
-# Last modified: March 10, 2012.
-
 %include fedora-live-kde.ks
 
-# DVD payload
-part / --size 10000
+# The recommended part size for DVDs is too close to use for the scientific spin
+part / --size 12288
 
 %packages
 
@@ -27,6 +25,11 @@ scilab
 scilab-devel
 scilab-doc
 
+# sagemath
+# BZ #1006230 should fix this
+sagemath
+sagemath-notebook
+
 #Devel tools
 
 #Install the mandatory packages from dev-tools and dev-libs
@@ -35,14 +38,41 @@ scilab-doc
 @development-libs
 @c-development
 @rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
 
 # Misc. related utils
 ddd
 valgrind
-ipython
+
+#python 2 tools/libraries not included from the groups
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+
+#python 3 and tools/libraries not included from the groups
+python3
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-networkx
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
 
 # Include Java development tools
 @java-development
+apache-commons-math
 
 #fortran compiler
 gcc-gfortran
@@ -54,7 +84,7 @@ rkward
 qtoctave
 
 # IDEs for the IDE folks
-eclipse
+@eclipse
 spyder
 
 #writing & publishing
@@ -71,21 +101,22 @@ kile
 BibTool
 pdfshuffler
 
-
 # Parallel/Distributed computing libraries/tools
 openmpi
+openmpi-devel
 valgrind-openmpi
 pvm
 pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
-
+mpi4py-openmpi
+python3-mpi4py-openmpi
 
 #Version control- a GUI for each as well
 
 # Installing rapidsvn will also install subversion package
 rapidsvn 
-# Install git-gui, will also install git
+git
 git-gui
 # Mercurial
 mercurial
@@ -94,7 +125,6 @@ mercurial-hgk
 #Backup Utilities
 backintime-kde
 
-
 #needs to install this specifically because of some conflict between openmpi
 #and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
 libotf
@@ -105,13 +135,13 @@ root-gui-fitpanel
 root-python
 
 #Multiple jobs/clustering system
-torque
-torque-server
-torque-scheduler
-torque-gui
-torque-libs
-torque-mom
-python-pbs
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
 
 #Drawing, Picture viewing tools, Visualization tools
 dia
@@ -125,8 +155,9 @@ Mayavi
 
 #Misc. Utils
 screen
+tmux
 rlwrap
-xchat
+hexchat
 shutter
 fig2ps
 bibtex2html
@@ -139,4 +170,4 @@ firefox
 
 %post
 
-%end
+%end

fedora-soas-packages.ks

@@ -34,6 +34,8 @@
 @sugar-desktop
 -sugar-ruler
 sugar-cp-updater
+lightdm
+lightdm-gtk
 
 # Write breaks unless we do this (we don't need it anyway)
 # enable for testing in the F17 dev cycle

fedora-x86_64-cloud.ks

@@ -0,0 +1,18 @@
+%include fedora-cloud-base.ks
+
+%packages
+kernel
+%end
+
+%post
+if [ ! -e /etc/sysconfig/kernel ]; then
+echo "Creating /etc/sysconfig/kernel."
+cat <<EOF > /etc/sysconfig/kernel
+# UPDATEDEFAULT specifies if new-kernel-pkg should make
+# new kernels the default
+UPDATEDEFAULT=yes
+
+# DEFAULTKERNEL specifies the default kernel package type
+DEFAULTKERNEL=kernel
+EOF
+fi