Add missing 'f' to updates and testing repo urls

Also update the comments at the top of fedora-live-kde.ks and
fedora-livecd-kde.ks, it's been ages since "livecd-kde" last fit on an
actual CD, the target size is 1 GiB now.

Makefile

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

fedora-desktop-packages.ks

@@ -20,12 +20,4 @@ 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-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 --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-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 --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-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)
@@ -144,7 +144,6 @@ kde-l10n-*
 libreoffice-langpack-*
 man-pages-*
 mythes-*
--gimp-help-*
 
 # Removals
 -PackageKit-zif

fedora-live-design-suite.ks

@@ -39,7 +39,6 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
-simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -72,7 +71,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
--rdesktop
+
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -119,22 +118,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
-<<<<<<< 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=Design tutorials
-Comment=List of websites using open source design software
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
-Type=Application
-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
 

fedora-live-jam-kde.ks

@@ -81,9 +81,6 @@ seq24
 muse
 qtractor
 non-session-manager
-non-daw
-non-sequencer
-non-mixer
 
 # audio-plugins
 calf

fedora-live-kde-base.ks

@@ -40,11 +40,12 @@ 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
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
+sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
 
 # set up user liveuser as default user and preselected user
-sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
 
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/

fedora-livecd-desktop.ks

@@ -90,8 +90,6 @@
 -gnu-free-mono-fonts
 -gnu-free-sans-fonts
 -gnu-free-serif-fonts
--uboot-tools
--dtc
 
 # Without gnu freefonts, the lack of Malayalam coverage is
 # a problem in anaconda (#977764)

fedora-livecd-mate-compiz.ks

@@ -13,6 +13,7 @@
 # Drop things for size
 -firefox
 -@libreoffice
+-mate-icon-theme-faenza
 
 # A web browser would be nice for a live cd
 midori

fedora-livecd-security.ks

@@ -18,9 +18,6 @@
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 
-# spin was failing to compose due to lack of space, so bumping the size.
-part / --size 10240
-
 %packages
 @xfce-desktop
 @xfce-apps
@@ -53,25 +50,14 @@ security-menus
 # exclude some packages to save some space
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
--aide
--binwalk
--bkhive
 -bonesi
--bro
 -cmospwd
 -dnstop
--etherape
 -hfsutils
--httpie
+-honeyd
--httrack
--hydra
 -kismon
--labrea
--nebula
 -netsed
 -onesixtyone
--packETH
--pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
@@ -80,11 +66,8 @@ security-menus
 -proxychains
 -pyrit
 -raddump
--rkhunter
 -safecopy
--samdump2
 -scalpel
--sshscan
 -sslstrip
 -tcpreen
 -tcpreplay

fedora-livecd-soas.ks

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

fedora-livedvd-electronic-lab.ks

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

fedora-livedvd-scientific-kde.ks

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

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

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