Remove stellarium from the games spin due to size

Things are going to be very close with removing just neverball. So it
looks like we need another removal and it is stellarium.

This is for bug 1168983.

.sparkleshare

@@ -1 +0,0 @@
-d6afc629dc9311ebd79b4cedb2775531065ecb05

SparkleShare.txt

@@ -1,9 +0,0 @@
-Congratulations, you've successfully created a SparkleShare repository!
-
-Any files you add or change in this folder will be automatically synced to 
-ssh://luya@git.fedorahosted.org/git/spin-kickstarts.git and everyone connected to it.
-
-SparkleShare is an Open Source software program that helps people collaborate and 
-share files. If you like what we do, consider buying us a beer: http://www.sparkleshare.org/
-
-Have fun! :)

custom/fedora-livedvd-haskell.ks

@@ -1,4 +1,4 @@
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 part / --size 6000
 

custom/qa-test-day.ks

@@ -3,7 +3,7 @@
 # Contact QA team if you have any improvements for this kickstart:
 # https://fedoraproject.org/wiki/QA
 
-%include ../fedora-live-workstation.ks
+%include ../fedora-livecd-desktop.ks
 
 
 ## System configuration

fedora-arm-base.ks

@@ -52,7 +52,7 @@ rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
 basearch=armhfp
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-echo "Packages within this ARM disk image"
+echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*

fedora-arm-kde.ks

@@ -2,7 +2,7 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-packages.ks
 
-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-arm-server.ks

@@ -1,29 +0,0 @@
-%include fedora-arm-base.ks
-
-%packages
--@fedora-release-nonproduct
--@dial-up
-# install the default groups for the server evironment since installing the environment is not working
-@server-product
-@standard
-@headless-management
-@container-management
-@domain-client
--initial-setup-gui
--generic-release*
-%end
-
-%post
-
-# 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 .
-
-echo -n "Enabling initial-setup text mode on startup"
-ln -s /usr/lib/systemd/system/initial-setup-text.service /etc/systemd/system/multi-user.target.wants/initial-setup-text.service
-echo .
-
-%end
-

fedora-arm-xfce.ks

@@ -1,7 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
 %include fedora-xfce-packages.ks
-part / --size=3500 --fstype ext4
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"

fedora-cloud-atomic-pxetolive.ks

@@ -1,31 +0,0 @@
-# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host
-# https://fedoraproject.org/wiki/Changes/AtomicHost
-
-lang en_US.UTF-8
-keyboard us
-timezone America/New_York
-zerombr
-clearpart --all --initlabel
-rootpw --lock --iscrypted locked
-user --name=none
-bootloader --timeout=1
-network --bootproto=dhcp --device=link --activate
-# We are only able to install atomic with separate /boot partition currently
-part / --fstype="ext4" --size=6000
-part /boot --size=500 --fstype="ext4"
-shutdown
-services --disabled=docker-storage-setup,network
-services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
- 
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
- 
-%post
-
-# Ensure the root password is locked, we use cloud-init
-passwd -l root
-userdel -r none
-
-# We copy content of separate /boot partition to root part when building live squashfs image,
-# and we don't want systemd to try to mount it when pxe booting
-cat /dev/null > /etc/fstab
-%end

fedora-cloud-atomic-vagrant.ks

@@ -1,28 +0,0 @@
-# Like the Atomic cloud image, but tuned for vagrant.  Enable
-# the vagrant user, disable cloud-init.
-
-%include fedora-cloud-atomic.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final
-
-user --name=vagrant --password=vagrant
-
-%post --erroronfail
-
-# Work around cloud-init being both disabled and enabled; need
-# to refactor to a common base.
-rm /etc/systemd/system/multi-user.target.wants/cloud-init* /etc/systemd/system/multi-user.target.wants/cloud-config*
-
-# Vagrant setup
-sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers
-echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
-sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
-mkdir -m 0700 -p ~vagrant/.ssh
-cat > ~vagrant/.ssh/authorized_keys << EOKEYS
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key
-EOKEYS
-chmod 600 ~vagrant/.ssh/authorized_keys
-chown -R vagrant:vagrant ~vagrant/.ssh/
-
-%end
-

fedora-cloud-atomic.ks

@@ -16,28 +16,29 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
 
-network --bootproto=dhcp --device=link --activate --onboot=on
+network --bootproto=dhcp --device=eth0 --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
 # Atomic differs from cloud - we want LVM
-part /boot --size=300 --fstype="ext4"
+part /boot --size=200 --fstype="ext4"
 part pv.01 --grow
 volgroup atomicos pv.01
-logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
+logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
 
-# Equivalent of %include fedora-repo.ks
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host
 
 reboot
 
+
+
 %post --erroronfail
 # See https://github.com/projectatomic/rpm-ostree/issues/42
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'
+ostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/21/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -45,6 +46,16 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
+# 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 .
+
 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.
@@ -109,6 +120,14 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
+
+# This is a temporary workaround for
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
+# where sfdisk seems to be messing up the mbr.
+# Long-term fix is to address this in anaconda directly and remove this.
+# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
+dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
+
 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 || :
@@ -117,3 +136,10 @@ echo "(Don't worry -- that out-of-space error was expected.)"
 
 %end
 
+%post --nochroot
+# Work around anaconda/dracut/lvm bug
+sync
+sync
+sync
+systemctl reboot -f -f
+%end

fedora-cloud-base.ks

@@ -11,7 +11,7 @@
 # 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.
 
-cmdline
+text
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -104,22 +104,17 @@ echo .
 
 # this is installed by default but we don't need it in virt
 echo "Removing linux-firmware package."
-dnf -C -y erase linux-firmware
+yum -C -y remove linux-firmware
 
 # Remove firewalld; was supposed to be optional in F18+, but is pulled in
 # in install/image building.
 echo "Removing firewalld."
-# FIXME! clean_requirements_on_remove is the default with DNF, but may
+yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-# not work when package was installed by Anaconda instead of command line.
-# Also -- check if this is still even needed with new anaconda -- disabled
-# firewall should _not_ pull in this package.
-# yum -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
-dnf -C -y erase "firewalld*"
 
 # Another one needed at install time but not after that, and it pulls
 # in some unneeded deps (like, newt and slang)
 echo "Removing authconfig."
-dnf -C -y erase authconfig
+yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
 
 # instlang hack. (Note! See bug referenced above package list)
 find /usr/share/locale -mindepth  1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
@@ -190,11 +185,10 @@ echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 echo "Removing random-seed so it's not the same in every image."
 rm -f /var/lib/random-seed
 
-echo "Cleaning old dnf repodata."
+echo "Cleaning old yum repodata."
-# FIXME: clear history?
+yum history new
-dnf clean all
+yum clean all
-truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/yum.log
-truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -217,10 +211,10 @@ rm -f /var/lib/rpm/__db*
 dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
 
 
-# FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
+mkdir -p /var/cache/yum
 chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
 chattr +i /boot/extlinux/ldlinux.sys

fedora-cloud-bigdata.ks

@@ -1,221 +0,0 @@
-# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image
-# but tailored specifically for Big Data processing out-of-the-box.
-# Primarily, it builds on that image but adds extra packages, but over
-# time may have additional focus.
-#
-# 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.
-
-text
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-user --name=none
-
-firewall --disabled
-
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
-
-network --bootproto=dhcp --device=eth0 --activate --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-zerombr
-clearpart --all
-part / --size 3000 --fstype ext4
-
-%include fedora-repo.ks
-
-
-reboot
-
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@core
-@cloud-server
-
-# Needed initially, but removed below.
-firewalld
-
-# rescue mode generally isn't useful in the cloud context
--dracut-config-rescue
-
-# Some things from @core we can do without in a minimal install
--biosdevname
--plymouth
--NetworkManager
--iprutils
--kbd
--uboot-tools
--kernel
--grub2
-
-%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,0)" >> /boot/grub/grub.conf
-  echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check 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
-# remove the user anaconda forces us to make
-userdel -r none
-
-# 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 .
-
-# 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"
-
-# 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-setup-link.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"
-PERSISTENT_DHCLIENT="yes"
-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 "Import RPM GPG key"
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-
-echo "Packages within this cloud image:"
-echo "-----------------------------------------------------------------------"
-rpm -qa
-echo "-----------------------------------------------------------------------"
-# Note that running rpm recreates the rpm db files which aren't needed/wanted
-rm -f /var/lib/rpm/__db*
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-chattr -i /boot/extlinux/ldlinux.sys
-/usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
-
-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,24 @@
+%packages
+@firefox
+@gnome-desktop
+@libreoffice
+@networkmanager-submodules
+
+# 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-docker-base.ks

@@ -5,7 +5,7 @@
 
 cmdline
 bootloader --location=none
-timezone --isUtc --nontp Etc/UTC
+timezone America/New_York --isUtc --nontp
 rootpw --plaintext qweqwe
 
 keyboard us
@@ -19,7 +19,6 @@ reboot
 %packages --excludedocs --instLangs=en --nocore
 bash
 fedora-release
-rootfiles
 vim-minimal
 yum
 #fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
@@ -45,20 +44,7 @@ basearch=$(uname -i)
 rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 
 rm -f /usr/lib/locale/locale-archive
-
-#Setup locale properly
-localedef -v -c -i en_US -f UTF-8 en_US.UTF-8
-
 rm -rf /var/cache/yum/*
 rm -f /tmp/ks-script*
 
-#Make it easier for systemd to run in Docker container
-cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/
-sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
-
-#Mask mount units and getty service so that we don't get login prompt
-systemctl mask systemd-remount-fs.service dev-hugepages.mount sys-fs-fuse-connections.mount systemd-logind.service getty.target console-getty.service
-
-rm -f /etc/machine-id
-
 %end

fedora-install-server.ks

@@ -72,6 +72,13 @@ dracut-*
 @core
 @hardware-support
 
+# Some development tools
+@development-libs
+@development-tools
+@c-development
+@rpm-development-tools
+@fedora-packager
+
 # Fedora Server.
 # Including this causes the fedora-release-server package to be included,
 # which in turn enables server-product-environment, and due to to its priority

fedora-kde-packages.ks

@@ -17,9 +17,5 @@ mariadb-embedded
 mariadb-libs
 mariadb-server
 
-# minimal localization support - allows installing the kde-l10n-* packages
-system-config-language
-kde-l10n
-
 %end
 

fedora-live-base.ks

@@ -14,7 +14,7 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns
 xconfig --startxonboot
-part / --size 4096 --fstype ext4
+part / --size 3072 --fstype ext4
 services --enabled=NetworkManager --disabled=network,sshd
 
 %include fedora-repo.ks
@@ -299,12 +299,6 @@ rm -f /core*
 # convince readahead not to collect
 # FIXME: for systemd
 
-# forcibly regenerate fontconfig cache (so long as this live image has
-# fontconfig) - see #1169979
-if [ -x /usr/bin/fc-cache ] ; then
-   fc-cache -f
-fi
-
 %end
 
 

fedora-live-design_suite.ks

@@ -1,5 +1,5 @@
 # fedora-design-suite.ks
-# Based on Live Workstation
+# Based on Live Desktop
 # Description:
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
@@ -7,7 +7,7 @@
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
-%include fedora-live-workstation.ks
+%include fedora-live-desktop.ks
 
 #DVD size partition
 part / --size 8192
@@ -16,19 +16,15 @@ part / --size 8192
 
 # graphics
 blender
-LuxRender-blender
-YafaRay-blender
 bluefish 
 #cinepaint
-#cmyktool
+cmyktool
-colord-extra-profiles
 darktable
 dia
 entangle
 fontforge
 font-manager 
 gimp
-gimp-elsamuko
 gimp-*-plugin
 gimp-data-extras
 gimp-gap
@@ -38,33 +34,26 @@ gimp-normalmap
 gimp-resynthesizer
 gimp-separate+
 gpick
-GraphicsMagick
+GREYCstoration-gimp 
-gmic-gimp
 hugin 
-ImageMagick
-inkscape
-inkscape-sozi
-inkscape-table
 mypaint
+inkscape
 nautilus-image-converter
 optipng
 phatch
 screenruler
 simple-scan
 scribus
-shutter
+colord-extra-profiles 
 synfigstudio
 xournal
 
 # office
 vym
-pdfmod
 pdfshuffler  
 
 # internet
 filezilla
-sparkleshare
-sshpass
 
 # audio & video
 audacity
@@ -75,10 +64,9 @@ aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
 campivisivi-titillium-fonts
 lato-fonts
-open-sans-fonts
 overpass-fonts
 
-# removal of unneeded applications
+# removal of duplicated and unneeded applications
 -gnome-boxes
 -gthumb
 -eog
@@ -91,7 +79,9 @@ overpass-fonts
 #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', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop', 'list-design-tutorials.desktop']
+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', 'list-design-tutorials.desktop']
+#Enable categories in Gnome Shell
+app-folder-categories=['Utilities', 'Games', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'wine-wine', 'Crossover', 'Crossover Games', 'Science', 'Education', 'Universal Access', 'Other']
 FOE
 
 # Add link to lists of tutorials
@@ -107,34 +97,10 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
-# Add information about Fedora Design Suite
-cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
-[Desktop Entry]
-Name=About Design Team 
-GenericName=About Design Team 
-Comment=Wiki page of Design Team
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-suite.desktop
-
-# Add information about Fedora Design Team
-cat >> /usr/share/applications/fedora-design-team.desktop << FOE
-[Desktop Entry]
-Name=About Design Suite
-GenericName=About Design Suite Wiki Page
-Comment=Wiki page of Design Team
-Exec=xdg-open http://fedoraproject.org/wiki/Design
-Type=Application
-Icon=applications-internet
-Categories=Documentation;
-FOE
-chmod a+x /usr/share/applications/fedora-design-team.desktop
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
+#EOF
+
 %end
 

fedora-live-desktop.ks

@@ -0,0 +1,65 @@
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-base.ks
+%include fedora-desktop-packages.ks
+
+part / --size 4096
+
+%post
+cat >> /etc/rc.d/init.d/livesys << EOF
+
+
+# disable updates plugin
+cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE
+[org.gnome.software]
+download-updates=false
+FOE
+
+# don't run gnome-initial-setup
+mkdir ~liveuser/.config
+touch ~liveuser/.config/gnome-initial-setup-done
+
+# make the installer show up
+if [ -f /usr/share/applications/liveinst.desktop ]; then
+  # Show harddisk install in shell dash
+  sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop ""
+  # need to move it to anaconda.desktop to make shell happy
+  mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop
+
+  cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
+[org.gnome.shell]
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'gnome-documents.desktop', 'anaconda.desktop']
+FOE
+
+  # Make the welcome screen show up
+  if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then
+    mkdir -p ~liveuser/.config/autostart
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
+    cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
+  fi
+fi
+
+# rebuild schema cache with any overrides we installed
+glib-compile-schemas /usr/share/glib-2.0/schemas
+
+# set up auto-login
+cat > /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
+FOE
+
+# Turn off PackageKit-command-not-found while uninstalled
+if [ -f /etc/PackageKit/CommandNotFound.conf ]; then
+  sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf
+fi
+
+# make sure to set the right permissions and selinux contexts
+chown -R liveuser:liveuser /home/liveuser/
+restorecon -R /home/liveuser/
+
+EOF
+
+%end

fedora-live-kde-base.ks

@@ -42,12 +42,12 @@ chown liveuser:liveuser /home/liveuser/.xsession
 # set up autologin for user liveuser
 if [ -f /etc/sddm.conf ]; then
 sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf
-sed -i 's/^#Session=.*/Session=plasma.desktop/' /etc/sddm.conf
+sed -i 's/^#Session=.*/Session=kde-plasma.desktop/' /etc/sddm.conf
 else
 cat > /etc/sddm.conf << SDDM_EOF
 [Autologin]
 User=liveuser
-Session=plasma.desktop
+Session=kde-plasma.desktop
 SDDM_EOF
 fi
 

fedora-livecd-desktop.ks

@@ -0,0 +1,112 @@
+# Desktop with customizations to fit in a CD (package removals, etc.)
+# Maintained by the Fedora Desktop SIG:
+# http://fedoraproject.org/wiki/SIGs/Desktop
+# mailto:desktop@lists.fedoraproject.org
+
+%include fedora-live-desktop.ks
+%include fedora-live-minimization.ks
+
+%packages
+# reduce the office suite in size
+-planner
+-libreoffice-xsltfilter
+-libreoffice-pyuno
+-libreoffice-emailmerge
+-libreoffice-math
+
+# remove some other applications
+-gnome-boxes
+-gnome-dictionary
+
+# remove input method things we don't need
+-ibus-typing-booster
+-imsettings
+-imsettings-gsettings
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.8.0-openjdk
+
+# Drop things that pull in perl
+-linux-atm
+
+# No printing
+-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.
+# also see http://bugzilla.gnome.org/681084
+-aspell-*
+-man-pages*
+-words
+
+# Help and art and fonts can be big, too
+-evolution-help
+-desktop-backgrounds-basic
+-*backgrounds-extras
+-stix-fonts
+
+# Legacy and cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+-quota
+-nano
+-minicom
+-dos2unix
+-finger
+-ftp
+-jwhois
+-mtr
+-pinfo
+-rsh
+-telnet
+-nfs-utils
+-ypbind
+-yp-tools
+-rpcbind
+-acpid
+-ntsysv
+-rmt
+-talk
+-lftp
+-tcpdump
+-dump
+
+# Drop some system-config things
+-system-config-language
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
+
+# These things are cut purely for space reasons
+-aisleriot
+-brasero
+-brasero-nautilus
+-bijiben
+-gnome-system-log
+-deja-dup
+-eog
+-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)
+lohit-malayalam-fonts
+
+%end
+
+%post
+
+# This is a huge file and things work ok without it
+rm -f /usr/share/icons/HighContrast/icon-theme.cache
+
+%end

fedora-livecd-mate_compiz.ks

@@ -17,17 +17,12 @@ mate-netspeed
 system-config-printer
 system-config-printer-applet
 
+
 # audio player
 audacious
 
-# office
-@libreoffice
-
-# dsl tools
-rp-pppoe
-
 # First, no office
-#-planner
+-planner
 
 # Drop things for size
 -@3d-printing
@@ -44,21 +39,43 @@ rp-pppoe
 -gnome-icon-theme-symbolic
 -gnome-software
 -gnome-themes
--gnome-themes-standard
 -gnome-user-docs
-
+-gstreamer1-plugins-good
+-gstreamer1-plugins-bad-free
+-gstreamer-plugins-good
+-gstreamer-plugins-bad-free
+-gstreamer-plugins-espeak
+-@guest-desktop-agents
+-@libreoffice
 -@mate-applications
 -mate-icon-theme-faenza
 -NetworkManager-bluetooth
+-samba-client
+-ibus-chewing
+-libical
+-OpenEXR-libs
 
 # Drop oversized fonts that aren't needed
+-gnu-free-mono-fonts
+-gnu-free-fonts-common
+-gnu-free-serif-fonts
+-gnu-free-sans-fonts
+-stix-fonts
+
+# Drop the Java plugin
+-icedtea-web
+-java-1.8.0-openjdk
 
 # Drop things that pull in perl
+-linux-atm
 
 # 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.
 # also see http://bugzilla.gnome.org/681084
+-aspell-*
+-man-pages*
+-words
 
 # Help and art can be big, too
 -gnome-user-docs
@@ -67,6 +84,24 @@ rp-pppoe
 -*backgrounds-extras
 
 # Legacy cmdline things we don't want
+-krb5-auth-dialog
+-krb5-workstation
+-pam_krb5
+
+-minicom
+
+-jwhois
+-mtr
+-pinfo
+-rsh
+-ypbind
+-yp-tools
+-ntsysv
+
+# Drop some system-config things
+-system-config-rootpassword
+-system-config-services
+-policycoreutils-gui
 
 %end
 

fedora-livecd-security.ks

@@ -75,6 +75,7 @@ gnome-keyring-pam
 -packETH
 -pads
 -pdfcrack
+-picviz-gui
 -proxychains
 -pyrit
 -raddump
@@ -87,7 +88,9 @@ gnome-keyring-pam
 -tcpreplay
 -tripwire
 -wipe
--zmap
+
+# Is not available for OpenVAS-7. No longer supported by upstream.
+-openvas-client 
 
 %end
 

fedora-livedvd-electronic_lab.ks

@@ -4,7 +4,7 @@
 # - Chitlesh Goorah <chitlesh a fedoraproject.org>
 # - Thibault North  <tnorth   a fedoraproject.org>
 
-%include fedora-live-workstation.ks
+%include fedora-livecd-desktop.ks
 
 # DVD payload
 part / --size 10240

fedora-livedvd-games.ks

@@ -33,7 +33,7 @@ asc
 asc-music
 astromenace
 beneath-a-steel-sky-cd
-#boswars # currently not building
+boswars
 btanks
 bzflag
 crossfire-client

fedora-repo-not-rawhide.ks

@@ -1,3 +1,3 @@
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f$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/metalink?repo=updates-testing-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

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

fedora-repo.ks

@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 
 # For the master branch the following should be uncommented
-# %include fedora-repo-rawhide.ks
+#%include fedora-repo-rawhide.ks
 
 # For non-master branches the following should be uncommented
 %include fedora-repo-not-rawhide.ks

fedora-soas-packages.ks

@@ -8,6 +8,7 @@
 # - Sebastian Dziallas <sdz AT fedoraproject DOT org>
 # - Mel Chua <mchua AT fedoraproject DOT org>
 
+
 %packages
 -@fonts
 -@dial-up
@@ -33,14 +34,6 @@
 -ibus*
 -hyperv-daemons
 
-# Add some extra fonts
-dejavu-sans-fonts
-dejavu-sans-mono-fonts
-madan-fonts
-aajohan-comfortaa-fonts
-sil-abyssinica-fonts
-vlgothic-fonts
-
 # == Core Sugar Platform ==
 @sugar-desktop
 -sugar-ruler

fedora-xfce-packages.ks

@@ -24,8 +24,6 @@ gnome-keyring-pam
 # Add some screensavers, people seem to like them
 # Note that blank is still default.
 xscreensaver-extras
-wget
-system-config-printer
 
 # save some space
 -autofs