Merge branch 'f20' of ssh://git.fedorahosted.org/git/spin-kickstarts into f20

fedora-live-design-suite.ks

@@ -39,6 +39,7 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
+simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -71,7 +72,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
-
+-rdesktop
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -118,6 +119,22 @@ 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-livecd-security.ks

@@ -51,13 +51,20 @@ security-menus
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
 -bonesi
+-bro
 -cmospwd
 -dnstop
 -hfsutils
 -honeyd
+-httrack
+-hydra
 -kismon
+-nebula
 -netsed
+-ntop
 -onesixtyone
+-packETH
+-pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
@@ -68,6 +75,7 @@ security-menus
 -raddump
 -safecopy
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay

fedora-livedvd-electronic-lab.ks

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

fedora-livedvd-scientific-kde.ks

@@ -13,7 +13,7 @@
 %include fedora-live-kde.ks
 
 # The recommended part size for DVDs is too close to use for the scientific spin
-part / --size 10240
+part / --size 11264
 
 %packages
 
@@ -25,6 +25,11 @@ scilab
 scilab-devel
 scilab-doc
 
+# sagemath
+# BZ #1006230 should fix this
+sagemath
+sagemath-notebook
+
 #Devel tools
 
 #Install the mandatory packages from dev-tools and dev-libs
@@ -159,7 +164,7 @@ bibtex2html
 hevea
 
 #Include Mozilla Firefox
-#firefox
+firefox
 
 %end