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,20 +1,34 @@
-# Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD)
-# 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
+
+DATADIR := $(DESTDIR)/share
+
+DOCDIR := $(DATADIR)/doc
+
+name := spin-kickstarts
 
 all: dist
 
+install:
+	mkdir -p -m 755 $(DATADIR)/$(name)
+	install *.ks* -m 644 $(DATADIR)/$(name)
+	mkdir -p -m 755 $(DATADIR)/$(name)/custom
+	install -m 644 custom/* $(DATADIR)/$(name)/custom
+	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
+	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
+
 clean:
-	rm -f spin-kickstarts-*.tar.gz
+	rm -f $(name)-*.tar.gz
 
-dist:
-	git archive --format=tar --prefix=spin-kickstarts-$(version)/ HEAD | gzip > spin-kickstarts.tar-$(version).gz
+dist:	$(name)-$(version).tar.gz
 
-publish:
-	scp spin-kickstarts-$(version).tar.gz fedorahosted.org:spin-kickstarts
+$(name)-$(version).tar.gz:
+	git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz
+
+publish:	$(name)-$(version).tar.gz
+	scp $(name)-$(version).tar.gz fedorahosted.org:$(name)
 
 dist-clean:
 	git clean -f -d

custom/qa-test-day.ks

@@ -66,7 +66,6 @@ selinux --permissive
 -realmd
 -rhythmbox
 -sane-backends*
--sendmail
 -shotwell
 -simple-scan
 -system-config-*
@@ -136,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

@@ -4,6 +4,9 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
+# configure extlinux bootloader
+bootloader --extlinux
+
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
 
@@ -20,9 +23,17 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae
 
+dracut-config-generic
+
 chrony
 arm-boot-config
+extlinux-bootloader
 initial-setup
+#lets resize / on first boot
+dracut-modules-growroot
+
+# remove this in %post
+dracut-config-generic
 
 # install uboot images
 uboot-beagle
@@ -33,6 +44,7 @@ uboot-smdkv310
 uboot-uevm
 uboot-wandboard_dl
 uboot-wandboard_solo
+uboot-wandboard_quad
 
 %end
 
@@ -44,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-arm-desktop-vfat.ks

@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-vfat-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+

fedora-arm-desktop.ks

@@ -0,0 +1,12 @@
+%include fedora-arm-base.ks
+%include fedora-arm-xbase.ks
+%include fedora-desktop-packages.ks
+%include fedora-arm-partitioning.ks
+
+part / --size=4000 --fstype ext4
+
+%packages
+-initial-setup
+
+%end
+

fedora-arm-kde-vfat.ks

@@ -3,6 +3,8 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-vfat-partitioning.ks
 
+part / --size=4000 --fstype ext4
+
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service

fedora-arm-kde.ks

@@ -3,6 +3,8 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-partitioning.ks
 
+part / --size=4000 --fstype ext4
+
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service

fedora-arm-mate-vfat.ks

@@ -3,6 +3,8 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-vfat-partitioning.ks
 
+part / --size=5000 --fstype ext4
+
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service

fedora-arm-mate.ks

@@ -3,6 +3,8 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-partitioning.ks
 
+part / --size=5000 --fstype ext4
+
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service

fedora-arm-minimal-vfat.ks

@@ -1,6 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-vfat-partitioning.ks
 
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
+
 %post
 
 # setup systemd to boot to the right runlevel

fedora-arm-minimal.ks

@@ -1,6 +1,9 @@
 %include fedora-arm-base.ks
 %include fedora-arm-partitioning.ks
 
+part swap --size=128 --fstype swap
+part / --size=1400 --fstype ext4
+
 %post
 
 # setup systemd to boot to the right runlevel

fedora-arm-partitioning.ks

@@ -1,5 +1,4 @@
-bootloader --location=none
 part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
-part / --grow --size=6500 --fstype ext4
+part / --size=3000 --fstype ext4
 

fedora-arm-vfat-partitioning.ks

@@ -1,5 +1,4 @@
-bootloader --location=none
 part /boot/uboot --size=20 --fstype vfat
 part swap --size=512 --fstype swap
-part / --grow --size=6500 --fstype ext4
+part / --size=3400 --fstype ext4
 

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-desktop-packages.ks

@@ -0,0 +1,23 @@
+%packages
+@firefox
+@gnome-desktop
+@libreoffice
+
+# FIXME; apparently the glibc maintainers dislike this, but it got put into the
+# desktop image at some point.  We won't touch this one for now.
+nss-mdns
+
+# This one needs to be kicked out of @standard
+-smartmontools
+
+# We use gnome-control-center's printer and input sources panels instead
+-system-config-printer
+-im-chooser
+
+# Similarly, there was also some debate about removing rsyslog from @standard
+# (since much of its functionality is provided by journald now), but it's
+# not going to happen for f20 either, so drop it here for now.
+# https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
+-rsyslog
+
+%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

@@ -25,7 +25,8 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
-%packages --default
+# @base got renamed to @standard, but @base is still included by default by pungi.
+%packages --default --nobase
 
 # pungi is an inclusive depsolver so that multiple packages are brought 
 # in to satisify dependencies and we don't always want that. So we  use
@@ -39,7 +40,8 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -generic*
 -GConf2-dbus*
 -bluez-gnome
--java-1.8.0-openjdk
+# Periods cause problems in paterns, so replace with *s
+-java-1*8*0-openjdk
 -community-mysql*
 -jruby*
 
@@ -142,6 +144,7 @@ kde-l10n-*
 libreoffice-langpack-*
 man-pages-*
 mythes-*
+-gimp-help-*
 
 # Removals
 -PackageKit-zif

fedora-live-base.ks

@@ -77,8 +77,6 @@ exists() {
     \$*
 }
 
-touch /.liveimg-configured
-
 # Make sure we don't mangle the hardware clock on shutdown
 ln -sf /dev/null /etc/systemd/system/hwclock-save.service
 
@@ -204,6 +202,13 @@ systemctl --no-reload disable atd.service 2> /dev/null || :
 systemctl stop crond.service 2> /dev/null || :
 systemctl stop atd.service 2> /dev/null || :
 
+# Mark things as configured
+touch /.liveimg-configured
+
+# add static hostname to work around xauth bug
+# https://bugzilla.redhat.com/show_bug.cgi?id=679486
+echo "localhost" > /etc/hostname
+
 EOF
 
 # bah, hal starts way too late
@@ -275,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

@@ -17,7 +17,7 @@ part / --size 8192
 # graphics
 blender
 bluefish 
-cinepaint
+#cinepaint
 cmyktool
 darktable
 dia
@@ -26,23 +26,28 @@ fontforge
 font-manager 
 gimp
 gimp-*-plugin
+gimp-data-extras
+gimp-paint-studio
+gimp-high-pass-filter
+gimp-normalmap
+gimp-resynthesizer
 gpick
 GREYCstoration-gimp 
 hugin 
-inkscape
 mypaint
+inkscape
 nautilus-image-converter
 optipng
-# pinta # is huge because it needs mono
-# postr # dropped because shotwell support flickr upload
+phatch
+screenruler
+simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
-# ufraw # dropped as duplicate of darktable
 xournal
 
 # office
-gnote
+vym
 pdfshuffler  
 
 # internet
@@ -52,19 +57,19 @@ 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
+campivisivi-titillium-fonts
 lato-fonts
 overpass-fonts
 
 # removal of duplicated and unneeded applications
 -gnome-boxes
+-gthumb
 -eog
+-gnome-photos
+-rdesktop
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -89,22 +94,55 @@ overpass-fonts
 
 %end
 
-#%post
+%post
+#Override the favorite desktop application in Dash
+cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
+#Enable categories in Gnome Shell
+app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+FOE
 
 # Add link to the Inkscape Course
-#cat >> /usr/share/applications/inkscape-course.desktop << FOE
-#[Desktop Entry]
-#Name=Introduction To Inkscape
-#GenericName=Inkscape Course
-#Comment=Materials from Máirín Duffy's Inkscape Class
-#Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
-#Type=Application
-#Icon=fedora-logo-icon
-#Categories=Graphics;Documentation;
-#FOE
-#chmod a+x /usr/share/applications/inkscape-course.desktop
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
+[Desktop Entry]
+Name=Introduction To Inkscape
+GenericName=Inkscape Course
+Comment=Materials from Máirín Duffy's Inkscape Class
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Type=Application
+Icon=fedora-logo-icon
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/inkscape-course.desktop
 
-#EOF
+<<<<<<< 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
 
-#%end
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+EOF
+
+%end
 

fedora-live-desktop.ks

@@ -3,27 +3,10 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
+%include fedora-desktop-packages.ks
 
 part / --size 4096
 
-%packages
-@firefox
-@gnome-desktop
-@libreoffice
-
-# FIXME; apparently the glibc maintainers dislike this, but it got put into the
-# desktop image at some point.  We won't touch this one for now.
-nss-mdns
-
-# This one needs to be kicked out of @standard
--smartmontools
-
-# We use gnome-control-center's printer and input sources panels instead
--system-config-printer
--im-chooser
-
-%end
-
 %post
 cat >> /etc/rc.d/init.d/livesys << EOF
 

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
@@ -116,7 +120,10 @@ lv2-c++-tools
 lv2-samplv1
 lv2-synthv1
 lv2-drumkv1
-
+lv2-triceratops
+lv2-newtonator
+lv2-x42-plugins
+lv2-fomp-plugins
 
 #dssi
 nekobee-dssi
@@ -140,6 +147,7 @@ nano
 mscore
 lilypond
 frescobaldi
+mup
 
 #audio utilities
 jamin
@@ -154,6 +162,7 @@ rtirq
 #patchage
 #ladish #not packaged yet
 japa
+radium-compressor
 
 #streaming
 idjc

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

@@ -2,7 +2,7 @@
 #
 # Description:
 # - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default CD-sized version
+#   see fedora-livecd-kde.ks for the default 1 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -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

@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Livecd Spin with the K Desktop Environment (KDE)
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -10,6 +10,9 @@
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 
+# DVD payload
+part / --size=4096
+
 
 %packages
 # unwanted packages from @kde-desktop
@@ -35,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-lxde.ks

@@ -36,7 +36,7 @@ MailClient=sylpheed.desktop
 FOE
 
 # set up auto-login for liveuser
-sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
+sed -i 's/# autologin=.*/autologin=liveuser/g' /etc/lxdm/lxdm.conf
 
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
@@ -45,32 +45,13 @@ cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
 # create default config for clipit, otherwise it displays a dialog on startup
 mkdir -p /home/liveuser/.config/clipit
-cat .config/clipit/clipitrc  << FOE
+cat > /home/liveuser/.config/clipit/clipitrc  << FOE
 [rc]
 use_copy=true
-use_primary=false
-synchronize=false
-automatic_paste=false
-show_indexes=false
 save_uris=true
-use_rmb_menu=false
 save_history=false
-history_limit=50
-items_menu=20
 statics_show=true
-statics_items=10
-hyperlinks_only=false
-confirm_clear=false
 single_line=true
-reverse_history=false
-item_length=50
-ellipsize=2
-history_key=<Ctrl><Alt>H
-actions_key=<Ctrl><Alt>A
-menu_key=<Ctrl><Alt>P
-search_key=<Ctrl><Alt>F
-offline_key=<Ctrl><Alt>O
-offline_mode=false
 FOE
 
 # this goes at the end after all other changes.

fedora-livecd-mate-compiz.ks

@@ -11,8 +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
@@ -65,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
@@ -78,4 +97,3 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 %end
-

fedora-livecd-security.ks

@@ -4,365 +4,157 @@
 #   A fully functional live OS based on Fedora for use in security auditing, 
 #   forensics research, and penetration testing.
 # Maintainers:
-#  Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
-#  Joerg Simon <jsimon [AT] fedoraproject <dot> org>
-#  Fabian Affolter <fab [AT] fedoraproject <dot> org>
+#   Fabian Affolter <fab [AT] fedoraproject <dot> org>
+#   Joerg Simon <jsimon [AT] fedoraproject <dot> org>
+#   Christoph Wickert <cwickert [AT] fedoraproject <dot> org>
 # Acknowledgements:
-#   Fedora LiveCD Xfce Spin team - some work here was inherited, many thanks!
+#   Fedora LiveCD Xfce Spin team - some work here was and will be inherited,
+#   many thanks!
 #   Fedora LXDE Spin - Copied over stuff to make LXDE Default
-#   Luke Macken, Adam Miller for the original OpenBox Security ks and all 
+#   Luke Macken and Adam Miller for the original OpenBox Security ks and all
 #   the Security Applications! 
 #   Hiemanshu Sharma <hiemanshu [AT] fedoraproject <dot> org>
-# Important!!!!
-#   Beginning with Security Stuff - we use pattern to parse the kickstart file 
-#   for building the security menu - please use 
-#   # Category: Categoryname <- for new Categories
-#   # Command: Commandname <- for the given Command
-#   # rCommand: Commandname <- for a command as root
-#   # Entry: Menu-Entry <- for the MenuEntry Name (optional)
 
 %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
-### LXDE desktop
-@lxde-desktop
-lxlauncher
-obconf
-lxdm
+@xfce-desktop
+@xfce-apps
 
-### internet
-firefox
-icedtea-web
-pidgin
-sylpheed
-transmission
+# Security tools (not ready at the moment)
+@security-lab
+security-menus
 
-### graphics
-#mtpaint
-
-### audio & video
-alsa-plugins-pulseaudio
-asunder
-lxmusic
-gxine
-gxine-mozplugin
-pavucontrol
-pnmixer
-# I'm looking for something smaller than
-#gnomebaker
-
-### utils
-galculator
-parcellite
-xpad
-
-### system
-gigolo
-Terminal
-
-### more desktop stuff
-fedora-icon-theme
-adwaita-cursor-theme
-adwaita-gtk2-theme
-adwaita-gtk3-theme
-
-# pam-fprint causes a segfault in LXDM when enabled
--fprintd-pam
-
-# needed for automatic unlocking of keyring (#643435)
+# unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
 
-network-manager-applet
-
-# needed for xdg-open to support LXDE
-perl-File-MimeInfo
-
-xcompmgr
-xdg-user-dirs-gtk
-xscreensaver-extras
-
-# use yumex instead of gnome-packagekit
-#yumex
--apper
--gnome-packagekit
-
-# LXDE has lxpolkit. Make sure no other authentication agents end up in the spin.
--polkit-gnome
--polkit-kde
-
-# make sure xfce4-notifyd is not pulled in
-notification-daemon
--xfce4-notifyd
-
-# make sure xfwm4 is not pulled in for firstboot
-# https://bugzilla.redhat.com/show_bug.cgi?id=643416
-metacity
-
-# Command line
-powertop
-wget
-yum-utils
-
-# dictionaries are big
--aspell-*
--hunspell-*
--man-pages-*
--words
-
 # save some space
--sendmail
-ssmtp
+-autofs
 -acpid
+-gimp-help
+-desktop-backgrounds-basic
+-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
 -system-config-boot
-#-system-config-language
--system-config-lvm
+#-system-config-network
 -system-config-rootpassword
 #-system-config-services
 -policycoreutils-gui
--gnome-disk-utility
 
-# we need UPower for suspend and hibernate
-upower
-
-###################### Security Stuffs ############################
-security-menus
-##################################################################
-# Category: Reconnaissance
-# rCommand: dsniff -h
-dsniff
-# rCommand: hping -h
-hping3
-nc6
-nc
-# Command: ncrack -h
-ncrack
-ngrep
-# rCommand: nmap -h
-nmap
-# Command: zenmap-root
-nmap-frontend
-# Command: p0f -h
-p0f
-# rCommand: sing -h
-sing
-# Command: scanssh -h
-#temp takout scanssh
-# rCommand: scapy -h
-scapy
-# Command: socat
-# Entry: Socket cat
-socat
-# rCommand: tcpdump -h
-tcpdump
-# rCommand: unicornscan -h
-unicornscan
-# rCommand: wireshark
-# Entry: Wireshark
-wireshark-gnome
-# Command: xprobe2
-xprobe2
-# Command: nbtscan
-nbtscan
-# Command: tcpxtract
-tcpxtract
-# Command: firewalk
-# Entry: Firewalk
-firewalk
-# Command: hunt
-# Entry: Hunt
-hunt
-# Command: dnsenum -h
-# Entry: DNS Enumeration
-dnsenum
-# rCommand: iftop
-iftop
-# Command: argus -h
-argus
-# rCommand: ettercap -C
-# Entry: Ettercap
-ettercap
-ettercap-gtk
-# rCommand: packETH
-packETH
-# rCommand: iptraf-ng
-iptraf-ng
-pcapdiff
-# rCommand: etherape
-etherape
-# Command: lynis
-lynis
-# rCommand: netsniff-ng
-netsniff-ng
-# Command: tcpjunk -x
-tcpjunk
-# rCommand: ssldump -h
-ssldump
-# rCommand: yersinia -G
-# Entry: Yersinia
-yersinia
-net-snmp
-# Command: openvas-client
-# Entry: OpenVAS Client
-openvas-client
-openvas-scanner
-
-#################################################################
-# Category: Forensics
-# Command: ddrescue -h
-ddrescue
-# Command: gparted
-gparted
-hexedit
-# rCommand: testdisk -h
-testdisk
-# Command: foremost -h
-# Entry: Foremost Filecarver
-foremost
-# Command: sectool-gui
-# Entry: sectool
-sectool-gui
-scanmem
-sleuthkit
-# Command: unhide
-unhide
-# Command: examiner
-# Entry: ELF Examiner
-examiner
-dc3dd
-afftools
-# Command: srm -h
-# Entry: Securely Remove Files
-srm
-# Command: nwipe
-# Entry: Securely erase disks
-nwipe
-# Command: firstaidkit -g gtk
-# Entry: First Aid Kit
-#firstaidkit-plugin-all #temp removed - dependency to grub2
-
-ntfs-3g
-ntfsprogs
-
-#####################################################################
-# Category: WebApplicationTesting
-# Command: httping -h
-httping
-# Command: nikto -help
-# Entry: Nikto Websecurity Scanner
-nikto
-# Command: ratproxy -h
-ratproxy
-# Command: lbd
-# Entry: Load Balancing Detector
-lbd
-# Command: skipfish
-skipfish
-# Command: sqlninja
-sqlninja
-
-#######################################################################
-# Category: Wireless
-# Command: aircrack-ng
-aircrack-ng
-# Command: airsnort
-airsnort
-# rCommand: kismet
-kismet
-# Command: weplab
-# Entry: Wep Key Cracker
-weplab
-# Command: wavemon
-wavemon
-
-#######################################################################
-# Category: CodeAnalysis
-# Command: splint
-splint
-# Command: pscan
-pscan
-# Command: flawfinder
-# Entry: Flawfinder
-flawfinder
-# Command: rats
-# Entry: Rough Auditing Tool for Security
-rats
-
-######################################################################
-# Category: IntrusionDetection
-# rCommand: chkrootkit
-chkrootkit
-# Command: aide -h
-aide
-labrea
-# Command: honeyd -h
-# Entry: Honeypot Daemon
-# temp removal
-#honeyd
-# Command: pads -h
-# Entry: Passive Asset Detection System
-pads
-nebula
-# Command: rkhunter
-# Entry: RootKitHunter
-rkhunter
-
-########################################################################
-# Category: PasswordTools
-# Command: john 
-john
-# Command: ophcrack 
-# Entry: Objectif Securite ophcrack
-ophcrack
-# Command: medusa -d
-# Entry: Medusa Brute Force
-medusa
+# 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
+-httpie
+-httrack
+-hydra
+-kismon
+-labrea
+-nebula
+-netsed
+-onesixtyone
+-packETH
+-pads
+-pdfcrack
+-picviz-gui
+-prelude-lml
+-prelude-manager
+-prewikka
+-proxychains
+-pyrit
+-raddump
+-rkhunter
+-safecopy
+-samdump2
+-scalpel
+-sshscan
+-sslstrip
+-tcpreen
+-tcpreplay
+-tripwire
+-wipe
 
 %end
 
 %post
-# LXDE and LXDM configuration
+# xfce configuration
+
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 # create /etc/sysconfig/desktop (needed for installation)
+
 cat > /etc/sysconfig/desktop <<EOF
-PREFERRED=/usr/bin/startlxde
-DISPLAYMANAGER=/usr/sbin/lxdm
+PREFERRED=/usr/bin/startxfce4
+DISPLAYMANAGER=/usr/sbin/lightdm
 EOF
 
 cat >> /etc/rc.d/init.d/livesys << EOF
-# disable screensaver locking and make sure gamin gets started
-cat > /etc/xdg/lxsession/LXDE/autostart << FOE
-/usr/libexec/gam_server
-@lxpanel --profile LXDE
-@pcmanfm --desktop --profile LXDE
-/usr/libexec/notification-daemon
+
+mkdir -p /home/liveuser/.config/xfce4
+
+cat > /home/liveuser/.config/xfce4/helpers.rc << FOE
+MailReader=sylpheed-claws
+FileManager=Thunar
+WebBrowser=midori
 FOE
 
-# set up preferred apps 
-cat > /etc/xdg/libfm/pref-apps.conf << FOE 
-[Preferred Applications]
-WebBrowser=firefox.desktop
-MailClient=redhat-sylpheed.desktop
+# disable screensaver locking (#674410)
+cat >> /home/liveuser/.xscreensaver << FOE
+mode:           off
+lock:           False
+dpmsEnabled:    False
 FOE
 
-# set up auto-login for liveuser
-sed -i 's|# autologin=dgod|autologin=liveuser|g' /etc/lxdm/lxdm.conf
+# deactivate xfconf-migration (#683161)
+rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
+
+# deactivate xfce4-panel first-run dialog (#693569)
+mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
+cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+
+# 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 Xfce as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
 
 # Show harddisk install on the desktop
 sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
-# Add autostart for parcellite
-cp /usr/share/applications/fedora-parcellite.desktop /etc/xdg/autostart
+# and mark it as executable (new Xfce security feature)
+chmod +x /home/liveuser/Desktop/liveinst.desktop
 
-# this goes at the end after all other changes.
+# this goes at the end after all other changes. 
 chown -R liveuser:liveuser /home/liveuser
 restorecon -R /home/liveuser
 
 EOF
 
 %end
-

fedora-livecd-soas.ks

@@ -26,8 +26,8 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 8 ('Ōhelo Berry)
-Fedora release 18 (Spherical Cow)
+Sugar on a Stick 10 (Unknown)
+Fedora release 20 (Rawhide)
 EOF
 
 # Add our activities to the favorites
@@ -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-games.ks

@@ -4,7 +4,7 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
-%include fedora-livecd-desktop.ks
+%include fedora-livecd-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 10240
@@ -91,7 +91,6 @@ lordsawar
 lure
 machineball
 nethack
-openlierox
 pachi
 pioneers
 quarry
@@ -187,7 +186,6 @@ games-menus
 # No compilations of games as I want to only include games that at least
 # someone thought were good within a genre.
 -kdegames
--gnome-games
 
 # Nothing should be downloading data to play.
 -autodownloader

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,8 +84,7 @@ rkward
 qtoctave
 
 # IDEs for the IDE folks
-netbeans
-eclipse
+@eclipse
 spyder
 
 #writing & publishing
@@ -63,7 +92,7 @@ emacs
 emacs-color-theme
 vim
 scribus
-scite
+#scite
 lyx
 kile
 
@@ -72,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
@@ -95,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
@@ -106,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
@@ -126,8 +155,9 @@ Mayavi
 
 #Misc. Utils
 screen
+tmux
 rlwrap
-xchat
+hexchat
 shutter
 fig2ps
 bibtex2html
@@ -140,4 +170,4 @@ firefox
 
 %post
 
-%end
+%end

fedora-lxde-packages.ks

@@ -32,13 +32,10 @@ metacity
 
 
 # dictionaries are big
--aspell-*
--hunspell-*
--man-pages-*
--words
+#-man-pages-*
+#-words
 
-# use ssmtp instead of sendmail
--sendmail
+# use ssmtp
 ssmtp
 
 # save some space
@@ -53,7 +50,7 @@ ssmtp
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
--wqy-zenhei-fonts
+-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
 
 # FIXME: can be removed once mtpaint is gone from lxde-apps in comps
 -mtpaint
@@ -67,8 +64,5 @@ ssmtp
 -policycoreutils-gui
 -gnome-disk-utility
 
-# we need UPower for suspend and hibernate
-upower
-
 %end
 

fedora-repo-not-rawhide.ks

@@ -0,0 +1,3 @@
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch

fedora-repo-rawhide.ks

@@ -0,0 +1 @@
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch

fedora-repo.ks

@@ -6,4 +6,4 @@
 %include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
-# %include fedora-repo-non-rawhide.ks
+# %include fedora-repo-not-rawhide.ks

fedora-soas-packages.ks

@@ -21,7 +21,6 @@
 -rdate
 -rdist
 -icedtea-web
--sendmail
 -firefox
 -glx-utils
 -nmap-ncat
@@ -35,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

fedora-xfce-packages.ks

@@ -39,7 +39,6 @@ gnome-keyring-pam
 
 # drop some system-config things
 -system-config-boot
--system-config-lvm
 -system-config-network
 -system-config-rootpassword
 #-system-config-services