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.
Remove file with non-graphic character in name
2025-12-08 16:10:29 +08:00 · 2013-07-04 10:57:37 -05:00 · 2013-07-04 10:50:43 -05:00 · 2013-07-04 09:59:00 -05:00 · 2013-07-04 09:53:01 -05:00 · 2013-07-04 14:55:30 +10:00
8 changed files with 29 additions and 30 deletions
--- a/10
+++ b/10
@@ -1,5 +1,5 @@
 # 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)
@@ -22,16 +22,16 @@ install:
 	install -m 644 custom/* $(DATADIR)/$(name)/custom
 	mkdir -p -m 755 $(DATADIR)/$(name)/l10n
 	install -m 644 l10n/* $(DATADIR)/$(name)/l10n
-	mkdir -p -m 755 $(DOCDIR)/$(name)-$(version)
-	install -m 644 AUTHORS COPYING README $(DOCDIR)/$(name)-$(version)

 clean:
 	rm -f $(name)-*.tar.gz

-dist:
+dist:	$(name)-$(version).tar.gz
+
+$(name)-$(version).tar.gz:
 	git archive --format=tar --prefix=$(name)-$(version)/ HEAD | gzip > $(name)-$(version).tar.gz

-publish:
+publish:	$(name)-$(version).tar.gz
 	scp $(name)-$(version).tar.gz fedorahosted.org:$(name)

 dist-clean:
--- a/fedoda-repo-rawhide.ks
+++ b/fedoda-repo-rawhide.ks
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -33,6 +33,7 @@ uboot-smdkv310
 uboot-uevm
 uboot-wandboard_dl
 uboot-wandboard_solo
+uboot-wandboard_quad

 %end

--- a/fedora-live-design-suite.ks
+++ b/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
-#[Desktop Entry]
-#Name=Introduction To Inkscape
-#GenericName=Inkscape Course
-#Comment=Materials from Máirín Duffy's Inkscape Class
-#Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
-#Type=Application
-#Icon=fedora-logo-icon
-#Categories=Graphics;Documentation;
-#FOE
-#chmod a+x /usr/share/applications/inkscape-course.desktop
+cat >> /usr/share/applications/inkscape-course.desktop << FOE
+[Desktop Entry]
+Name=Introduction To Inkscape
+GenericName=Inkscape Course
+Comment=Materials from Máirín Duffy's Inkscape Class
+Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape
+Type=Application
+Icon=fedora-logo-icon
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/inkscape-course.desktop

-#EOF
-
-#%end
+EOF

+%end
--- a/fedora-livedvd-games.ks
+++ b/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
--- a/fedora-livedvd-scientific-kde.ks
+++ b/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

--- a/fedora-repo-not-rawhide.ks
+++ b/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
--- a/fedora-repo-rawhide.ks
+++ b/fedora-repo-rawhide.ks
@@ -0,0 +1 @@
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
Author	SHA1	Message	Date
Bruno Wolff III	6bb61fa057	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.	2013-07-04 10:57:37 -05:00
Bruno Wolff III	d79ee1b027	Remove file with non-graphic character in name	2013-07-04 10:50:43 -05:00
Dennis Gilmore	bdf04f705a	add missing fedora-repo-rawhide.ks file and put in repo definitions for fedora-repo-not-rawhide.ks	2013-07-04 09:59:00 -05:00
Dennis Gilmore	69c0debc5d	ARM: add uboot for wandboard-quad to images	2013-07-04 09:53:01 -05:00
Amit Saha	1d87b18f46	Scientific: remove/disable non-existent packages	2013-07-04 14:55:30 +10:00
Bruno Wolff III	12e9f1e583	The publish target should build a tar ball if needed	2013-07-02 22:17:39 -05:00
Bruno Wolff III	53643faf8f	Games: Base on xfce instead of gnome The xfce spin is smaller and will work on some older systems (for at least some games) than gnome will.	2013-07-02 07:00:17 -05:00
Luya Tshimbalanga	3cd8f80d1b	design: remove cinepaint due to bug #904256 , readd tutorial	2013-07-01 23:25:05 -07:00
Bruno Wolff III	314afb81d0	Handle trying to remake the tar ball Now running make when the tar ball already exists will result in it not being recreated.	2013-06-29 22:18:08 -05:00
Bruno Wolff III	0ecefe0230	Fix to work with multiple tags If there are multiple tags pointing to HEAD we need to pick only one. We'll take one that seems to be a version number. This allows the version number tag to coexist with another tag, that perhaps indicates which images it was used to build.	2013-06-29 22:08:06 -05:00
Bruno Wolff III	247595b762	Don't install stuff that ends in the doc directory	2013-06-29 15:59:10 -05:00
				`@@ -0,0 +1 @@`
				`repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch`