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

Makefile.am

@@ -10,6 +10,7 @@ kickstart_DATA = \
     fedora-livecd-desktop-nl_NL.ks \
     fedora-livecd-desktop-pt_BR.ks \
     fedora-livecd-desktop-pt_PT.ks \
+    fedora-livecd-education-math.ks \
     fedora-livecd-electronic-lab.ks \
     fedora-livecd-electronic-lab-nl_NL.ks \
     fedora-livecd-electronic-lab-pt_PT.ks \
@@ -23,6 +24,7 @@ kickstart_DATA = \
     fedora-livedvd-developer.ks \
     fedora-livedvd-developer-nl_NL.ks \
     fedora-livedvd-developer-pt_PT.ks \
+    fedora-livedvd-electronic-lab.ks \
     fedora-livedvd-games.ks \
     fedora-livedvd-games-nl_NL.ks \
     fedora-livedvd-games-pt_PT.ks
@@ -44,7 +46,7 @@ DISTCLEANFILES =           \
 install-exec-local:
 
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgdatadir)
+	rm -rf $(DESTDIR)$(pkgdatadir)
 
 clean:
 	rm -f ChangeLog

fedora-livedvd-games.ks

@@ -54,14 +54,12 @@ torcs
 tremulous
 ultimatestunts
 vdrift
-vegastrike
 warzone2100
 wesnoth
 widelands
 worminator
 wormux
 xmoto
-xpilot-ng
 
 # traditional (small)
 
@@ -169,6 +167,7 @@ vodovod
 # card games
 
 poker2d
+PySolFC
 
 # educational/simulation