Fix up repo definitions

Someone noticed that I messed up the repo definitions for live images,
but the fix wasn't right for the live images. The install image uses
a source repo, but the live images don't. The repo commands for the
install image are in the install image itself. It is also safe to
include the updates repo since an updates repo is created for branched
that has no packages and stays that way until release is gold. That
way the same repo set can be used before and after release. Also a
commented out repo definition for updates-testing is provided to help
people who want to enable that.

Makefile

@@ -1,17 +1,38 @@
 # Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD)
+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
+
+DATADIR := $(DESTDIR)/share
+
+DOCDIR := $(DATADIR)/doc
+
+name := spin-kickstarts
+
 all: dist
 
-clean:
+install:
-	rm -f spin-kickstarts-*.tar.gz
+	mkdir -p -m 755 $(DATADIR)/$(name)
+	install *.ks* -m 644 $(DATADIR)/$(name)
+	mkdir -p -m 755 $(DATADIR)/$(name)/custom
+	install -m 644 custom/* $(DATADIR)/$(name)/custom
+	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
+	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
 
-dist:
+clean:
-	git archive --format=tar --prefix=spin-kickstarts-$(version)/ HEAD | gzip > spin-kickstarts.tar-$(version).gz
+	rm -f $(name)-*.tar.gz
+
+dist:	$(name)-$(version).tar.gz
+
+$(name)-$(version).tar.gz:
+	git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz
+
+publish:	$(name)-$(version).tar.gz
+	scp $(name)-$(version).tar.gz fedorahosted.org:$(name)
 
 dist-clean:
 	git clean -f -d

README

@@ -15,9 +15,9 @@ cd spin-kickstarts
 git checkout BRANCHNAME
 # No tag has been added yet tag HEAD with
 git tag VERSION
-git push tag VERSION
+git push --tags
 make
 # Publish the released tar ball
-scp spin-kickstarts-*.tar.gz fedorahosted.org:spin-kickstarts
+make publish
 # Clean up the generated files:
 make clean

fedora-arm-base.ks

@@ -33,6 +33,7 @@ uboot-smdkv310
 uboot-uevm
 uboot-wandboard_dl
 uboot-wandboard_solo
+uboot-wandboard_quad
 
 %end
 

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 <sdz AT fedoraproject DOT org>
+# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -17,7 +17,7 @@ part / --size 8192
 # graphics
 blender
 bluefish 
-cinepaint
+#cinepaint
 cmyktool
 darktable
 dia
@@ -33,8 +33,6 @@ inkscape
 mypaint
 nautilus-image-converter
 optipng
-# pinta # is huge because it needs mono
-# postr # dropped because shotwell support flickr upload
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -42,7 +40,7 @@ synfigstudio
 xournal
 
 # office
-gnote
+bijiben	# replaces gnote
 pdfshuffler  
 
 # internet
@@ -53,8 +51,6 @@ audacity
 pitivi
 
 # system
-# gtk-recordmydesktop # dropped for space (#887991)
-# network-manager-applet #part of Gnome Desktop
 
 # fonts
 aajohan-comfortaa-fonts
@@ -89,22 +85,21 @@ overpass-fonts
 
 %end
 
-#%post
+%post
 
 # Add link to the Inkscape Course
-#cat >> /usr/share/applications/inkscape-course.desktop << FOE
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
-#[Desktop Entry]
+[Desktop Entry]
-#Name=Introduction To Inkscape
+Name=Introduction To Inkscape
-#GenericName=Inkscape Course
+GenericName=Inkscape Course
-#Comment=Materials from Máirín Duffy's Inkscape Class
+Comment=Materials from Máirín Duffy's Inkscape Class
-#Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
-#Type=Application
+Type=Application
-#Icon=fedora-logo-icon
+Icon=fedora-logo-icon
-#Categories=Graphics;Documentation;
+Categories=Graphics;Documentation;
-#FOE
+FOE
-#chmod a+x /usr/share/applications/inkscape-course.desktop
+chmod a+x /usr/share/applications/inkscape-course.desktop
 
-#EOF
+EOF
-
-#%end
 
+%end

fedora-livedvd-games.ks

@@ -4,7 +4,7 @@
 # - Bruno Wolff III <bruno@wolff.to>
 # - Formerly maintained by Rahul Sundaram
 
-%include fedora-livecd-desktop.ks
+%include fedora-livecd-xfce.ks
 
 # The recommended part size for DVDs is too close to use for the games spin
 part / --size 10240

fedora-livedvd-scientific-kde.ks

@@ -54,7 +54,6 @@ rkward
 qtoctave
 
 # IDEs for the IDE folks
-netbeans
 eclipse
 spyder
 
@@ -63,7 +62,7 @@ emacs
 emacs-color-theme
 vim
 scribus
-scite
+#scite
 lyx
 kile
 

fedora-repo-not-rawhide.ks

@@ -0,0 +1,3 @@
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-$releasever&arch=$basearch

fedora-repo-rawhide.ks

@@ -0,0 +1 @@
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch