kde: SDDM doesn't start (#1015048)

Conflicts:
	fedora-live-design-suite.ks

Makefile

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

custom/qa-test-day.ks

@@ -135,14 +135,29 @@ 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
 
-PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
-cat << FOE >> $PREFDIR/test-day.js
+# 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
 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

@@ -23,8 +23,6 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae
 
-dracut-config-generic
-
 chrony
 arm-boot-config
 extlinux-bootloader
@@ -32,9 +30,6 @@ initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
 
-# remove this in %post
-dracut-config-generic
-
 # install uboot images
 uboot-beagle
 uboot-beaglebone
@@ -50,24 +45,11 @@ uboot-wandboard_quad
 
 %post
 
-# work around for poor key import UI in PackageKit
-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 LiveCD"
-rpm -qa
-# Note that running rpm recreates the rpm db files which aren't needed or wanted
-rm -f /var/lib/rpm/__db*
-
 # Because memory is scarce resource in most arm systems we are differing from the Fedora
 # default of having /tmp on tmpfs.
 echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 
 /usr/sbin/a-b-c
-
-yum -y remove dracut-config-generic
-
 %end
 

fedora-cloud-base.ks

@@ -1,226 +0,0 @@
-# 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
-
-firewall --disabled
-
-bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
-
-network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
-
-
-zerombr
-clearpart --all
-part / --size 1000 --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
-
-# 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"
-
-# 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 "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*
-
-
-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

@@ -20,4 +20,12 @@ nss-mdns
 # https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
 -rsyslog
 
+# Remove a few apps that are being presented as featured apps in
+# gnome-software
+-transmission-gtk
+-simple-scan
+-gnome-photos
+-gnome-maps
+-gnome-weather
+
 %end

fedora-i386-cloud.ks

@@ -1,20 +0,0 @@
-%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-cloud.ks

@@ -1,99 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# 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
-
-# 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
-
-# Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (default groups for the configured repos are added by --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
-# 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
-
-
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@jbossas
-
-# Things needed for installation
-@anaconda-tools
-
-# Langpacks
-autocorr-*
-eclipse-nls-*
-hunspell-*
-hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
-man-pages-*
-mythes-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
-%end

fedora-install-fedora.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
+#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 
 # 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
+repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)

fedora-install-server.ks

@@ -1,102 +0,0 @@
-# Kickstart file for composing the "Fedora" spin of Fedora (rawhide)
-# Maintained by the Fedora Release Engineering team:
-# https://fedoraproject.org/wiki/ReleaseEngineering
-# mailto:rel-eng@lists.fedoraproject.org
-
-# Use a part of 'iso' to define how large you want your isos.
-# Only used when composing to more than one iso.
-# Default is 695 (megs), CD size.
-# Listed below is the size of a DVD if you wanted to split higher.
-#part iso --size=4998
-
-# Add the repos you wish to use to compose here.  At least one of them needs group data.
-
-# Only uncomment repo commands in one of the two following sections.
-# Because the install kickstart doesn't use the updates repo and does 
-# 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
-
-# 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
-
-# Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (default groups for the configured repos are added by --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
-# 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-agents
-@standard
-@core
-@input-methods
-@multimedia
-@hardware-support
-@admin-tools
-@basic-desktop
-
-# Workstation
-@eclipse
-@development-libs
-@development-tools
-@c-development
-@rpm-development-tools
-@fedora-packager
-@virtualization
-@web-server
-@mongodb
-@perl-web
-@php
-@python-web
-@rubyonrails
-@mysql
-@sql-server
-@design-suite
-@jbossas
-
-# Things needed for installation
-@anaconda-tools
-
-# Langpacks
-autocorr-*
-eclipse-nls-*
-hunspell-*
-hyphen-*
-calligra-l10n-*
-kde-l10n-*
-libreoffice-langpack-*
-man-pages-*
-mythes-*
--gimp-help-*
-
-# Removals
--PackageKit-zif
--zif
-%end

fedora-live-base.ks

@@ -280,9 +280,7 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-releasever=$(rpm -q --qf '%{version}\n' fedora-release)
-basearch=$(uname -i)
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
 echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
@@ -303,7 +301,7 @@ rm -f /core*
 
 
 %post --nochroot
-cp $INSTALL_ROOT/usr/share/doc/*-release/GPL $LIVE_ROOT/GPL
+cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then

fedora-live-design-suite.ks

@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
+# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -27,12 +27,9 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
-gimp-gap
-gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
-gimp-separate+
 gpick
 GREYCstoration-gimp 
 hugin 
@@ -59,6 +56,10 @@ 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
@@ -100,7 +101,7 @@ 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', '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']
+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
@@ -118,23 +119,26 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
-# Add link to lists of tutorials
+<<<<<<< HEAD
+=======
+# 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=List of Tutorials for Designers
-Comment=Reference of Design Related Tutorials
-Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
-Icon=applications-graphics
+Icon=applicatons-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
+>>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-#EOF
+EOF
 
 %end
 

fedora-live-jam-kde.ks

@@ -33,7 +33,6 @@ alsa-plugins-samplerate
 alsa-plugins-upmix
 alsa-plugins-vdownmix
 a2jmidid
-aj-snapshot
 
 #jack 
 jack-audio-connection-kit
@@ -76,7 +75,7 @@ sooperlooper
 
 #recodring and DAW
 audacity
-ardour3
+ardour
 rosegarden4
 seq24
 muse
@@ -122,11 +121,6 @@ lv2-synthv1
 lv2-drumkv1
 lv2-triceratops
 lv2-newtonator
-lv2-x42-plugins
-lv2-fomp-plugins
-lv2-sorcer
-lv2-fabla
-lv2-artyfx-plugins
 
 #dssi
 nekobee-dssi

fedora-live-kde.ks

@@ -28,6 +28,7 @@ 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,10 +14,6 @@
 -libreoffice-emailmerge
 -libreoffice-math
 
-# remove some other applications
--gnome-boxes
--gnome-dictionary
-
 # remove input method things we don't need
 -ibus-typing-booster
 -imsettings
@@ -35,9 +31,6 @@
 -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.

fedora-livecd-kde.ks

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

fedora-livecd-mate-compiz.ks

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

fedora-livecd-security.ks

@@ -24,14 +24,15 @@ part / --size 10240
 %packages
 @xfce-desktop
 @xfce-apps
+#@xfce-extra-plugins
+#@xfce-media
+#@xfce-office
+#@firefox
 
 # Security tools (not ready at the moment)
 @security-lab
 security-menus
 
-# unlock default keyring. FIXME: Should probably be done in comps
-gnome-keyring-pam
-
 # save some space
 -autofs
 -acpid
@@ -40,16 +41,13 @@ 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-boot
+#-system-config-network
 -system-config-rootpassword
+#-system-config-services
 -policycoreutils-gui
 
 # exclude some packages to save some space

fedora-livecd-soas.ks

@@ -51,7 +51,6 @@ 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

fedora-lxde-packages.ks

@@ -12,9 +12,7 @@
 @lxde-apps
 @lxde-media
 @lxde-office
-
-# FIXME: can be omitted once comps is updated
-midori
+@firefox
 
 # pam-fprint causes a segfault in LXDM when enabled
 -fprintd-pam
@@ -37,6 +35,9 @@ metacity
 #-man-pages-*
 #-words
 
+# use ssmtp
+ssmtp
+
 # save some space
 -autofs
 -acpid
@@ -49,7 +50,10 @@ metacity
 -stix-fonts
 -ibus-typing-booster
 -xscreensaver-extras
-#-wqy-zenhei-fonts           # FIXME: Workaround to save space, do this in comps
+-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
 
 # drop some system-config things
 -system-config-boot

fedora-mate-packages.ks

@@ -1,8 +1,6 @@
 %packages
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
--ConsoleKit                 # ConsoleKit is deprecated
--ConsoleKit-x11             # ConsoleKit is deprecated
 firefox
 @mate
 compiz

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
+%include fedora-repo-not-rawhide.ks

fedora-x86_64-cloud.ks

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