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.

custom/fedora-livedvd-haskell.ks

@@ -1,4 +1,4 @@
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.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-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 
 ## System configuration
@@ -136,7 +136,7 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
 rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
 
 PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
-cat << FOE >> $PREFDIR/test-day.js
+cat << FOE >> $PREFDIR/00-test-day.js
 pref("startup.homepage_welcome_url","");
 pref("startup.homepage_override_url","");
 pref("browser.rights.3.shown", true);

fedora-arm-base.ks

@@ -34,7 +34,7 @@ extlinux-bootloader
 initial-setup
 initial-setup-gui
 #lets resize / on first boot
-dracut-modules-growroot
+# dracut-modules-growroot
 
 # remove this in %post
 dracut-config-generic

fedora-arm-minimal.ks

@@ -7,6 +7,7 @@ part / --size=1400 --fstype ext4
 -@standard
 -@dial-up
 -initial-setup-gui
+-generic-release*
 %end
 
 %post

fedora-cloud-atomic.ks

@@ -16,93 +16,28 @@ user --name=none
 
 firewall --disabled
 
-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"
 
 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
+# Atomic differs from cloud - we want LVM
+part /boot --size=300 --fstype="ext4"
+part pv.01 --grow
+volgroup atomicos pv.01
+logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
 
+# Equivalent of %include fedora-repo.ks
+ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host
 
 reboot
 
-# Package list.
-%packages
-
-fedora-release-cloud
-
-kernel-core
-@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
-
-# 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
--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
+# 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/rawhide/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
@@ -110,35 +45,6 @@ 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 .
-
-# 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"
-
-# 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.
@@ -196,16 +102,6 @@ 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 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
@@ -213,15 +109,6 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
-
-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 || :

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.
 
-text
+cmdline
 lang en_US.UTF-8
 keyboard us
 timezone --utc Etc/UTC
@@ -34,42 +34,19 @@ part / --size 3000 --fstype ext4
 
 %include fedora-repo.ks
 
-
 reboot
 
 # Package list.
-%packages
-
-fedora-release-cloud
+# FIXME: instLangs does not work, so there's a hack below
+# (see https://bugzilla.redhat.com/show_bug.cgi?id=1051816)
+%packages --instLangs=en
 
 kernel-core
-@core
-grubby
+@^cloud-server-environment
 
-# 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
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
-# Needed initially, but removed below.
-firewalld
-
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
@@ -125,24 +102,36 @@ 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
+dnf -C -y erase linux-firmware
 
-# Remove firewalld; was supposed to be optional in F18+, but is required to
-# be present for install/image building.
+# Remove firewalld; was supposed to be optional in F18+, but is pulled in
+# in install/image building.
 echo "Removing firewalld."
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+# FIXME! clean_requirements_on_remove is the default with DNF, but may
+# 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."
-yum -C -y remove authconfig --setopt="clean_requirements_on_remove=1"
+dnf -C -y erase authconfig
+
+# 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 {} +
+localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
+# this will kill a live system (since it's memory mapped) but should be safe offline
+mv -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+build-locale-archive
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
+awk '(NF==0&&!done){print "override_install_langs='$LANG'";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
 
 echo -n "Getty fixes"
 # although we want console output going to the serial console, we don't
@@ -201,10 +190,11 @@ 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 yum repodata."
-yum history new
-yum clean all
-truncate -c -s 0 /var/log/yum.log
+echo "Cleaning old dnf repodata."
+# FIXME: clear history?
+dnf clean all
+truncate -c -s 0 /var/log/dnf.log
+truncate -c -s 0 /var/log/dnf.rpm.log
 
 echo "Import RPM GPG key"
 releasever=$(rpm -q --qf '%{version}\n' fedora-release)
@@ -219,10 +209,18 @@ echo "-----------------------------------------------------------------------"
 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
+
+
+# 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

@@ -44,31 +44,13 @@ fedora-release-cloud
 
 kernel-core
 @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 
+@cloud-server
 
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
+# 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
@@ -125,11 +107,6 @@ 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
@@ -218,6 +195,13 @@ 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

fedora-cloud-experimental.ks

@@ -35,32 +35,14 @@ fedora-release-cloud
 
 kernel-core
 @core
-grubby
+@cloud-server
 
-# 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
+# rescue mode generally isn't useful in the cloud context
 -dracut-config-rescue
 
-syslinux-extlinux 
-
 # Needed initially, but removed below.
 firewalld
 
-# cherry-pick a few things from @standard
-tar
-rsync
-
 # Some things from @core we can do without in a minimal install
 -biosdevname
 -plymouth
@@ -116,11 +98,6 @@ 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
@@ -128,7 +105,7 @@ 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"
+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)
@@ -210,6 +187,14 @@ echo "-----------------------------------------------------------------------"
 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

fedora-desktop-packages.ks

@@ -1,24 +0,0 @@
-%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

@@ -0,0 +1,49 @@
+# This is a minimal Fedora install designed to serve as a Docker base image. 
+#
+# To keep this image minimal it only installs English language. You need to change
+# yum configuration in order to enable other languages.
+
+cmdline
+bootloader --location=none
+timezone America/New_York --isUtc --nontp
+rootpw --plaintext qweqwe
+
+keyboard us
+firewall --disable
+zerombr
+clearpart --all
+part / --size 3000 --fstype ext4
+reboot
+
+%packages --excludedocs --instLangs=en --nocore
+bash
+fedora-release
+vim-minimal
+yum
+#fakesystemd #TODO: waiting for review https://bugzilla.redhat.com/show_bug.cgi?id=1118740
+-kernel
+
+
+%end
+
+%post --log=/tmp/anaconda-post.log
+# Set the language rpm nodocs transaction flag persistently in the
+# image yum.conf and rpm macros
+
+LANG="en_US"
+echo "%_install_lang $LANG" > /etc/rpm/macros.image-language-conf
+
+awk '(NF==0&&!done){print "override_install_langs='$LANG'\ntsflags=nodocs";done=1}{print}' \
+    < /etc/yum.conf > /etc/yum.conf.new
+mv /etc/yum.conf.new /etc/yum.conf
+
+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
+
+rm -f /usr/lib/locale/locale-archive
+rm -rf /var/cache/yum/*
+rm -f /tmp/ks-script*
+
+%end

fedora-install-cloud.ks

@@ -1,4 +1,4 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
+# Kickstart file for composing the "Fedora Cloud" spin of Fedora (rawhide)
 # Maintained by the Fedora Release Engineering team:
 # https://fedoraproject.org/wiki/ReleaseEngineering
 # mailto:rel-eng@lists.fedoraproject.org
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
+#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -37,60 +37,52 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 -kernel-tools*
 -syslog-ng*
 -astronomy-bookmarks
--generic*
+# generic* would match generic-jms-ra, so don't 'simplify' this
+-generic-logos*
+-generic-release*
 -GConf2-dbus*
 -bluez-gnome
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
 -community-mysql*
--jruby*
+# jruby used to be in this list, but springframework-context explicitly
+# requires it, not just 'any ruby implemention' - please check for things
+# on the image that require mvn(org.jruby:jruby) before adding jruby to
+# this list again - adamw 2014/09
+#-jruby
 
 # core
 kernel*
 dracut-*
 
-# Desktops
-
-## common stuff
-@base-x
-@guest-desktop-agents
-@guest-agents
-@standard
-@core
-@dial-up
-@fonts
-@input-methods
-@multimedia
-@hardware-support
-@printing
-@admin-tools
-@basic-desktop
-
-
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@javaenterprise
 
 # Things needed for installation
 @anaconda-tools
+fedora-productimg-cloud
+
+# Packages to enable server images to run in cloud environments
+@cloud-server
+@core
+@standard
+@headless-management
+@dogtag
+@directory-server
+@dns-server
+@freeipa-server
+@ftp-server
+@guest-agents
+@ha
+@load-balancer
+@mail-server
+@mysql
+@network-server
+@smb-server
+@sql-server
+@web-server
 
 # Langpacks
 autocorr-*
-eclipse-nls-*
 hunspell-*
 hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
 man-pages-*
-mythes-*
 -gimp-help-*
 
 # Removals

fedora-install-server.ks

@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
+#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -60,21 +60,31 @@ dracut-*
 
 -@legacy-fonts
 
+-@multimedia
 
 ## common stuff
 @guest-agents
 @standard
 @core
-@multimedia
 @hardware-support
 
-# Workstation
+# 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
+# this will be the default environment.
+@^server-product-environment
+@server-product
+@headless-management
+@container-management
+@domain-client
+
 # Common server packages
 @mysql
 @sql-server
@@ -103,8 +113,6 @@ dracut-*
 @load-balancer
 @ha
 
-@container-management
-@headless-management
 @javaenterprise
 
 # “uservisible” groups we want to offer
@@ -115,6 +123,7 @@ dracut-*
 
 # Things needed for installation
 @anaconda-tools
+fedora-productimg-server
 
 # Langpacks
 autocorr-*

fedora-install-workstation.ks

@@ -16,12 +16,14 @@
 # use the source repo, we can't just include fedora-repo.ks
 
 # In the master branch the rawhide repo commands should be uncommented.
-repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
 
 # In non-master branches the fedora repo commands should be uncommented
-#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+#repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
+
+%include fedora-workstation-packages.ks
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -31,122 +33,17 @@ repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirror
 # 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
 # an exclusion list to cut out things we don't want
-
 -kernel*debug*
 -kernel-kdump*
 -kernel-tools*
--syslog-ng*
 -astronomy-bookmarks
 -generic*
--GConf2-dbus*
--bluez-gnome
-# Periods cause problems in paterns, so replace with *s
--java-1*8*0-openjdk
--community-mysql*
--jruby*
 
 # core
 kernel*
-dracut-*
-
-# Desktops
-
-## common stuff
-@base-x
-@guest-desktop-agents
-@guest-agents
-@standard
-@core
-@dial-up
-@fonts
-@input-methods
-@multimedia
-@hardware-support
-@printing
-@admin-tools
-@basic-desktop
-
-## GNOME
-@firefox
-@gnome-desktop
-@epiphany
-@libreoffice
-@gnome-games
-
-## KDE
-@kde-desktop
-@kde-apps
-@kde-education
-@kde-media
-@kde-office
-
-## XFCE
-@xfce-desktop
-@xfce-apps
-@xfce-extra-plugins
-@xfce-media
-@xfce-office
-
-## LXDE
-@lxde-desktop
-@lxde-apps
-@lxde-media
-@lxde-office
-
-## SUGAR
-@sugar-desktop
-@sugar-apps
-
-## MATE
-@mate-desktop
-
-## CINNAMON
-@cinnamon-desktop
-
-# Workstation
-@eclipse
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-@gnome-software-development
-@kde-software-development
-@x-software-development
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@design-suite
-## Not included yet due to space concerns
-#@javaenterprise
-#@milkymist
-#@mingw32
-#@ocaml
-#@robotics-suite
-#@electronic-lab
 
 # Things needed for installation
 @anaconda-tools
+fedora-productimg-workstation
 
-# Langpacks
-autocorr-*
-eclipse-nls-*
-hunspell-*
-hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
-man-pages-*
-mythes-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
 %end

fedora-kde-packages.ks

@@ -2,6 +2,7 @@
 @kde-apps
 @kde-desktop
 @kde-media
+@kde-office
 @kde-telepathy
 @networkmanager-submodules
 
@@ -16,5 +17,9 @@ 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

@@ -24,6 +24,7 @@ services --enabled=NetworkManager --disabled=network,sshd
 @guest-desktop-agents
 @standard
 @core
+@fedora-release-nonproduct
 @fonts
 @input-methods
 @dial-up
@@ -44,8 +45,8 @@ memtest86+
 anaconda
 @anaconda-tools
 
-# Make live images easy to shutdown and the like in libvirt
-qemu-guest-agent
+# Need aajohan-comfortaa-fonts for the SVG rnotes images
+aajohan-comfortaa-fonts
 
 %end
 
@@ -77,9 +78,6 @@ exists() {
     \$*
 }
 
-# Make sure we don't mangle the hardware clock on shutdown
-ln -sf /dev/null /etc/systemd/system/hwclock-save.service
-
 livedir="LiveOS"
 for arg in \`cat /proc/cmdline\` ; do
   if [ "\${arg##rd.live.dir=}" != "\${arg}" ]; then
@@ -159,12 +157,6 @@ if ! strstr "\`cat /proc/cmdline\`" nopersistenthome && [ -n "\$homedev" ] ; the
   action "Mounting persistent /home" mountPersistentHome
 fi
 
-# make it so that we don't do writing to the overlay for things which
-# are just tmpdirs/caches
-mount -t tmpfs -o mode=0755 varcacheyum /var/cache/yum
-mount -t tmpfs vartmp /var/tmp
-[ -x /sbin/restorecon ] && /sbin/restorecon /var/cache/yum /var/tmp >/dev/null 2>&1
-
 if [ -n "\$configdone" ]; then
   exit 0
 fi
@@ -278,6 +270,14 @@ chmod 755 /etc/rc.d/init.d/livesys-late
 # enable tmpfs for /tmp
 systemctl enable tmp.mount
 
+# make it so that we don't do writing to the overlay for things which
+# are just tmpdirs/caches
+# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
+cat >> /etc/fstab << EOF
+vartmp   /var/tmp    tmpfs   defaults   0  0
+varcacheyum /var/cache/yum  tmpfs   mode=0755,context=system_u:object_r:rpm_var_cache_t:s0   0   0
+EOF
+
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
 releasever=$(rpm -q --qf '%{version}\n' --whatprovides system-release)
@@ -303,7 +303,7 @@ rm -f /core*
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then

fedora-live-design_suite.ks

@@ -7,7 +7,7 @@
 # - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
-%include fedora-live-desktop.ks
+%include fedora-live-workstation.ks
 
 #DVD size partition
 part / --size 8192
@@ -16,6 +16,9 @@ part / --size 8192
 
 # graphics
 blender
+# add blender plugins
+LuxRender-blender
+YafaRay-blender
 bluefish 
 #cinepaint
 cmyktool
@@ -25,6 +28,7 @@ entangle
 fontforge
 font-manager 
 gimp
+gimp-elsamuko
 gimp-*-plugin
 gimp-data-extras
 gimp-gap
@@ -34,7 +38,8 @@ gimp-normalmap
 gimp-resynthesizer
 gimp-separate+
 gpick
-GREYCstoration-gimp 
+# replaces GREYCStationary
+gmic-gimp  
 hugin 
 mypaint
 inkscape
@@ -73,27 +78,6 @@ overpass-fonts
 -gnome-photos
 -rdesktop
 
-# Legacy cmdline things we don't want
--krb5-auth-dialog
--krb5-workstation
--pam_krb5
--quota
--minicom
--dos2unix
--finger
--ftp
--jwhois
--mtr
--pinfo
--rsh
--telnet
--nfs-utils
--ypbind
--yp-tools
--rpcbind
--acpid
--ntsysv
-
 %end
 
 %post

fedora-live-desktop.ks

@@ -1,65 +0,0 @@
-# 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

@@ -40,11 +40,16 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
-
-# set up user liveuser as default user and preselected user
-sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
-sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+if [ -f /etc/sddm.conf ]; then
+sed -i 's/^#User=.*/User=liveuser/' /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=kde-plasma.desktop
+SDDM_EOF
+fi
 
 # 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 1 GiB version
+#   see fedora-livecd-kde.ks for the default 1.4 GiB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -22,35 +22,14 @@ kde-wallpapers
 
 # Additional packages that are not default in kde-desktop but useful
 k3b				# ~15 megs
-calligra
 #kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
 fuse
 liveusb-creator
 #pavucontrol			# pavucontrol has duplicate functionality with kmix
 krusader			# file manager, more power-user-oriented than Dolphin (~4 megs)
 
 # kdeedu apps
-blinken
-kalzium
-kanagram
-kgeography
-khangman
-kiten
-klettres
-ktouch
-kturtle
-kwordquiz
-parley
-step
-marble
-kstars
-kalgebra
-kbruch
-kig
-kmplot
-rocs
-cantor
+@kde-education
 
 # Cantor backends
 cantor-R		# Cantor R backend, built against R-core at compile time

fedora-live-mate_compiz.ks

@@ -19,7 +19,6 @@ fi
 mkdir /home/liveuser/Desktop
 cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop
 
-
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 

fedora-live-workstation.ks

@@ -34,7 +34,7 @@ if [ -f /usr/share/applications/liveinst.desktop ]; then
 
   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']
+favorite-apps=['firefox.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop']
 FOE
 
   # Make the welcome screen show up
@@ -43,6 +43,11 @@ FOE
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/
     cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/
   fi
+
+  # Copy Anaconda branding in place
+  if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then
+    cp -a /usr/share/lorax/product/* /
+  fi
 fi
 
 # rebuild schema cache with any overrides we installed

fedora-livecd-desktop.ks

@@ -1,112 +0,0 @@
-# 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-kde.ks

@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
+# - Fedora Live Spin with the K Desktop Environment (KDE), default 1.4 GB version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -19,7 +19,6 @@ part / --size=4096
 # don't include these for now to fit on a cd
 -desktop-backgrounds-basic
 -kdeaccessibility*
--scribus			# scribus is too big for the live images
 -kdeartwork-screensavers	# screensavers are not needed on live images
 #-ktorrent			# kget has also basic torrent features (~3 megs)
 -digikam			# digikam has duplicate functionality with gwenview (~28 megs)
@@ -28,14 +27,9 @@ part / --size=4096
 #-kdeplasma-addons		# ~16 megs
 #-krusader			# ~4 megs
 
-# Additional packages that are not default in kde-desktop but useful
+# Additional packages that are not default in kde-* groups, but useful
 k3b				# ~15 megs
--calligra			# don't include whole calligra, just parts of it
-calligra-words
-calligra-sheets			# ~1 megs
-calligra-stage			# ~3 megs
 #kdeartwork			# only include some parts of kdeartwork
-#twinkle			# (~10 megs)
 fuse
 liveusb-creator
 
@@ -46,11 +40,11 @@ kdegames-minimal
 ### space issues
 
 # fonts (we make no bones about admitting we're english-only)
-wqy-microhei-fonts	# a compact CJK font, to replace:
--nhn-nanum-gothic-fonts	# Korean
--vlgothic-fonts		# Japanese
--wqy-zenhei-fonts	# simplified Chinese
--cjkuni-uming-fonts	# traditional Chinese
+wqy-microhei-fonts			# a compact CJK font, to replace:
+-naver-nanum-gothic-fonts		# Korean
+-vlgothic-fonts				# Japanese
+-adobe-source-han-sans-cn-fonts		# simplified Chinese
+-adobe-source-han-sans-twhk-fonts	# traditional Chinese
 
 -paratype-pt-sans-fonts	# Cyrillic (already supported by DejaVu), huge
 #-stix-fonts		# mathematical symbols
@@ -65,8 +59,14 @@ wqy-microhei-fonts	# a compact CJK font, to replace:
 # save some space (from @standard)
 -make
 
-# save space (it pulls in gdisk/udisks2/libicu)
+# admin-tools
 -gnome-disk-utility
+# kcm_clock still lacks some features, so keep system-config-date around
+#-system-config-date
+# prefer kcm_systemd
+-system-config-services
+# prefer/use kusers
+-system-config-users
 
 ## avoid serious bugs by omitting broken stuff
 

fedora-livecd-mate_compiz.ks

@@ -3,10 +3,14 @@
 # http://fedoraproject.org/wiki/SIGs/Desktop
 # mailto:desktop@lists.fedoraproject.org
 
-%include fedora-live-mate-compiz.ks
+%include fedora-live-mate_compiz.ks
 %include fedora-live-minimization.ks
 
 %packages
+
+# audio player
+audacious
+
 # First, no office
 -planner
 
@@ -15,26 +19,50 @@
 -brasero
 -bluez
 -bluez-cups
+-caja-image-converter
+-colord
+-compiz-plugins-extra
+-compiz-plugins-unsupported
 -@dial-up
--dnf
--firefox
+-espeak
+-fedora-icon-theme
+-GConf2
 -gnome-bluetooth-libs
+-gnome-icon-theme
 -gnome-icon-theme-symbolic
 -gnome-software
+-gnome-themes
 -gnome-user-docs
+-gstreamer1-plugins-good
+-gstreamer1-plugins-bad-free
+-gstreamer-plugins-good
+-gstreamer-plugins-bad-free
+-gstreamer-plugins-espeak
+-gucharmap
 -@guest-desktop-agents
 -@libreoffice
+-lftp
 -@mate-applications
--mate-bluetooth
 -mate-icon-theme-faenza
+-NetworkManager-bluetooth
 -transmission-gtk
+-samba-client
+-ibus-chewing
+-ImageMagick
+-ImageMagick-libs
+-libical
+-OpenEXR-libs
+-reiserfs-utils
+-seahorse
+-vim-common
+-vim-enhanced
 
 # Drop oversized fonts that aren't needed
--cjkuni-uming-fonts
--wqy-zenhei-fonts
-
-# A web browser would be nice for a live cd
-midori
+-gnu-free-mono-fonts
+-gnu-free-fonts-common
+-gnu-free-serif-fonts
+-gnu-free-sans-fonts
+-stix-fonts
 
 # Drop the Java plugin
 -icedtea-web
@@ -46,6 +74,12 @@ midori
 # No printing
 -foomatic-db-ppds
 -foomatic
+-gutenprint
+-gutenprint-cups
+-gutenprint-libs
+-cups
+-cups-filters
+-cups-pk-helper
 
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
@@ -85,8 +119,11 @@ midori
 # Drop some system-config things
 -system-config-language
 -system-config-printer
+-system-config-printer-libs
+-system-config-printer-udev
 -system-config-rootpassword
 -system-config-services
+-system-config-users
 -policycoreutils-gui
 
 %end

fedora-livecd-soas.ks

@@ -26,9 +26,9 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 11 (Unknown)
-Fedora release 21 (Rawhide)
+Sugar on a Stick
 EOF
+cat /etc/fedora-release >> /boot/olpc_build
 
 # Add our activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << EOF
@@ -76,13 +76,19 @@ sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.con
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 
 # Don't use the default system user (in SoaS liveuser) as nick name
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t string /desktop/sugar/user/default_nick disabled >/dev/null
-
 # Disable the logout menu item in Sugar
-gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
-
 # 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 >/usr/share/glib-2.0/schemas/sugar.soas.gschema.override <<EOF
+[org.sugarlabs.user]
+default-nick='disabled'
+
+[org.sugarlabs]
+show-logout=false
+
+[org.sugarlabs.power]
+automatic=true
+EOF
+/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
 
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin

fedora-livedvd-electronic_lab.ks

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

fedora-livedvd-games.ks

@@ -53,12 +53,12 @@ maniadrive-music
 megaglest
 nethack-vultures
 netpanzer
-neverball
+#neverball #cut for size
 nogravity
 pinball
 scorched3d
 supertux
-supertuxkart
+#supertuxkart #remove for size
 ultimatestunts
 warzone2100
 wesnoth
@@ -171,7 +171,6 @@ celestia
 childsplay
 gcompris
 planets
-stellarium
 tuxpaint
 tuxpaint-stamps
 tuxtype2

fedora-livedvd-scientific_kde.ks

@@ -48,21 +48,26 @@ ddd
 valgrind
 
 #python 2 tools/libraries not included from the groups
+python-tools
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
+python-pandas
 
 #python 3 and tools/libraries not included from the groups
 python3
+python3-tools
 python3-matplotlib
 python3-scipy
 python3-numpy
 python3-ipython
 python3-ipython-console
 python3-ipython-notebook
+python3-sympy
 python3-networkx
+python3-pandas
 
 # matplotlib backends
 python-matplotlib-qt4

fedora-mate-packages.ks

@@ -11,7 +11,6 @@ compiz-plugins-extra
 compiz-manager
 compizconfig-python
 compiz-plugins-unsupported
-compiz-bcop
 compiz-mate
 libcompizconfig
 compiz-plugins-main

fedora-workstation-packages.ks

@@ -1,70 +1,29 @@
 %packages
-@firefox
-@gnome-desktop
+
+# Exclude unwanted groups that fedora-live-base.ks pulls in
+-@dial-up
+-@fedora-release-nonproduct
+-@input-methods
+-@standard
+
+# Make sure to sync any additions / removals done here with
+# workstation-product-environment in comps
+@base-x
+@core
+@fonts
+@guest-desktop-agents
+@hardware-support
 @libreoffice
+@multimedia
 @networkmanager-submodules
+@printing
+@workstation-product
 
-#QT
-qt
-qt-settings
-qt-x11
-qt5-qtbase
-qt5-qtbase-gui
-qt5-qtdeclarative
-qt5-qtxmlpatterns
+# Branding for the installer
+fedora-productimg-workstation
 
-devassistant
-scl-utils
-
-# 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
-
--aisleriot
--baobab
--biosdevname
--coolkey
--deja-dup
--dtc
--dump
--ed
--finger
--ftp
--gc
+# Exclude unwanted packages from @anaconda-tools group
 -gfs2-utils
--gnu-free-fonts-common
--gnu-free-mono-fonts
--gnu-free-sans-fonts
--gnu-free-serif-fonts
--gtk2-immodule-xim
--gtk3-immodule-xim
--gtkmm24
--guile
--imsettings*
--irda-utils
--irqbalance
--isdn4k-utils
--kernel-modules-extra
--lftp
--linux-atm
--minicom
--nano
--ntsysv
--numactl
 -reiserfs-utils
--rsh
--tagsoup
--talk
--telnet
--uboot-tools
--xl2tpd
--NetworkManager-l2tp
 
 %end

fedora-xfce-packages.ks

@@ -21,6 +21,9 @@
 
 # unlock default keyring. FIXME: Should probably be done in comps
 gnome-keyring-pam
+# Add some screensavers, people seem to like them
+# Note that blank is still default.
+xscreensaver-extras
 
 # save some space
 -autofs
@@ -30,18 +33,6 @@ gnome-keyring-pam
 -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-network
--system-config-rootpassword
-#-system-config-services
--policycoreutils-gui
 
 %end

l10n/fedora-live-workstation-de_CH.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-de_CH.ks
+# fedora-live-workstation-de_CH.ks
 #
 # Maintainer(s):
 # - Fabian Affolter <fab at fedoraproject.org>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang de_DE.UTF-8
 keyboard sg-latin1-nodeadkeys

l10n/fedora-live-workstation-de_DE.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-de_DE.ks
+# fedora-live-workstation-de_DE.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang de_DE.UTF-8
 keyboard de-latin1-nodeadkeys

l10n/fedora-live-workstation-fr_FR.ks

@@ -1,4 +1,4 @@
-# fedora-livecd-desktop-fr_FR.ks
+# fedora-live-workstation-fr_FR.ks
 #
 # Description:
 # - French Fedora Live Spin with the Gnome Desktop Environment
@@ -6,7 +6,7 @@
 # Maintainer(s):
 # - Matthieu Saulnier <fantom@fedoraproject.org>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang fr_FR.UTF-8
 keyboard fr-latin9

l10n/fedora-live-workstation-nl_NL.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-nl_NL.ks
+# fedora-live-workstation-nl_NL.ks
 #
 # Maintainer(s):
 # - Jeroen van Meeuwen <kanarip a fedoraunity.org>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang nl_NL.UTF-8
 keyboard us

l10n/fedora-live-workstation-pt_BR.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-pt_BR.ks
+# fedora-live-workstation-pt_BR.ks
 #
 # Maintainer(s):
 # - Igor Pires Soares <igor at projetofedora.org>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang pt_BR.UTF-8
 keyboard br-abnt2

l10n/fedora-live-workstation-pt_PT.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-pt_PT.ks
+# fedora-live-workstation-pt_PT.ks
 #
 # Maintainer(s):
 # - Pedro Silva <pedrofsilva a netcabo.pt>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang pt_PT.UTF-8
 keyboard pt-latin1

l10n/fedora-live-workstation-ru_RU.ks

@@ -1,9 +1,9 @@
-# fedora-livecd-desktop-ru_RU.ks
+# fedora-live-workstation-ru_RU.ks
 #
 # Maintainer(s):
 # Sergey Mihailov <sergey.mihailov at gmail.com>
 
-%include ../fedora-livecd-desktop.ks
+%include ../fedora-live-workstation.ks
 
 lang ru_RU.UTF-8
 keyboard ru