[spin-kickstarts] SoaS: add FotoToon
by Peter Robinson
commit 0741647868988899296e669ab29f0426b5b9b32b
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Wed Oct 23 17:35:44 2013 +0100
SoaS: add FotoToon
fedora-livecd-soas.ks | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 61faa07..5e057ae 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -51,6 +51,7 @@ org.laptop.StopWatchActivity
org.laptop.community.Finance
org.laptop.community.TypingTurtle
org.laptop.sugar.Jukebox
+org.eq.FotoToon
org.gnome.Labyrinth
com.laptop.Ruler
org.sugarlabs.AbacusActivity
10 years, 5 months
[spin-kickstarts] fix and simplify setting of firefox homepage in qa-test-day.ks
by Adam Williamson
commit 681365531c3ceb49f8a972cc023acfc4fa0109f6
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue Oct 22 09:13:24 2013 -0700
fix and simplify setting of firefox homepage in qa-test-day.ks
custom/qa-test-day.ks | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks
index 3569bee..4c7beeb 100644
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@@ -135,29 +135,14 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
# Remove anaconda welcome screen (if it exists), it would display instead of ours
rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
-# Change Firefox start page to open Test Day wiki and IRC chat
-# (and a few more properties)
-mkdir /tmp/firefox
-unzip /usr/lib*/firefox/browser/omni.ja -d /tmp/firefox
-
-cat << FOE > /tmp/firefox/chrome/en-US/locale/branding/browserconfig.properties
-browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day
-FOE
-
-cat << FOE >> /tmp/firefox/defaults/preferences/firefox-branding.js
+PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
+cat << FOE >> $PREFDIR/test-day.js
pref("startup.homepage_welcome_url","");
pref("startup.homepage_override_url","");
pref("browser.rights.3.shown", true);
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://fedoraproject.org/wiki/T... | http://webchat.freenode.net/?channels=fedora-test-day");
FOE
-# We need to re-zip the whole archive (instead of just updating files), because
-# the original archive is "Firefox optimized" and updating doesn't work
-# https://bugzilla.mozilla.org/show_bug.cgi?id=605524
-OMNIJA=`ls /usr/lib*/firefox/browser/omni.ja`
-rm -f $OMNIJA
-(cd /tmp/firefox; zip -r -0 $OMNIJA *)
-rm -rf /tmp/firefox
-
# Adjust launchers in dash using a vendor override. (Adding a profile would
# be another way to do this.)
cat << FOE >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
10 years, 5 months
[spin-kickstarts/f20] fix and simplify setting of firefox homepage in qa-test-day.ks
by Adam Williamson
commit 1021a05fd1e7077312b72d10cac47bf9cffdd14f
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Tue Oct 22 09:13:24 2013 -0700
fix and simplify setting of firefox homepage in qa-test-day.ks
custom/qa-test-day.ks | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/custom/qa-test-day.ks b/custom/qa-test-day.ks
index 3569bee..4c7beeb 100644
--- a/custom/qa-test-day.ks
+++ b/custom/qa-test-day.ks
@@ -135,29 +135,14 @@ ln -s /usr/share/applications/test-day-welcome.desktop /etc/xdg/autostart/
# Remove anaconda welcome screen (if it exists), it would display instead of ours
rm -f /home/liveuser/.config/autostart/fedora-welcome.desktop
-# Change Firefox start page to open Test Day wiki and IRC chat
-# (and a few more properties)
-mkdir /tmp/firefox
-unzip /usr/lib*/firefox/browser/omni.ja -d /tmp/firefox
-
-cat << FOE > /tmp/firefox/chrome/en-US/locale/branding/browserconfig.properties
-browser.startup.homepage=https://fedoraproject.org/wiki/Test_Day:Current | http://webchat.freenode.net/?channels=fedora-test-day
-FOE
-
-cat << FOE >> /tmp/firefox/defaults/preferences/firefox-branding.js
+PREFDIR=`ls -d /usr/lib*/firefox/browser/defaults/preferences`
+cat << FOE >> $PREFDIR/test-day.js
pref("startup.homepage_welcome_url","");
pref("startup.homepage_override_url","");
pref("browser.rights.3.shown", true);
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=https://fedoraproject.org/wiki/T... | http://webchat.freenode.net/?channels=fedora-test-day");
FOE
-# We need to re-zip the whole archive (instead of just updating files), because
-# the original archive is "Firefox optimized" and updating doesn't work
-# https://bugzilla.mozilla.org/show_bug.cgi?id=605524
-OMNIJA=`ls /usr/lib*/firefox/browser/omni.ja`
-rm -f $OMNIJA
-(cd /tmp/firefox; zip -r -0 $OMNIJA *)
-rm -rf /tmp/firefox
-
# Adjust launchers in dash using a vendor override. (Adding a profile would
# be another way to do this.)
cat << FOE >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override
10 years, 5 months
[spin-kickstarts/f20] Use git version to get version name
by Bruno Wolff III
commit dcebd2c540594c55277e0da6d4c9c6e9215de9b6
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Fri Oct 18 15:10:14 2013 -0500
Use git version to get version name
Using git version is simpler as it handles oddball cases internally.
Since we have been using mostly lightweight tags I have set it to
search those in addition to annotated tags for the best match. The
output for commits that don't have a tag seems a bit nicer as well.
Conflicts:
Makefile
Makefile | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/Makefile b/Makefile
index ca8011b..c1f57d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,5 @@
-# Get the version name first by seeing if HEAD is tagged
-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
+# Get a version name based off the nearest tag (include lightweight tags)
+version := $(shell git describe --tags)
DESTDIR := /usr
10 years, 5 months
[spin-kickstarts] Use git version to get version name
by Bruno Wolff III
commit 1bdc87189a2069923c1040508caa9b92d169e64e
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Fri Oct 18 15:10:14 2013 -0500
Use git version to get version name
Using git version is simpler as it handles oddball cases internally.
Since we have been using mostly lightweight tags I have set it to
search those in addition to annotated tags for the best match. The
output for commits that don't have a tag seems a bit nicer as well.
Makefile | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/Makefile b/Makefile
index 853b317..c1f57d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,5 @@
-# Get the version name first by seeing if HEAD is tagged
-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)
-endif
+# Get a version name based off the nearest tag (include lightweight tags)
+version := $(shell git describe --tags)
DESTDIR := /usr
10 years, 5 months
[spin-kickstarts: 2/2] design: add tutorials list lnk
by Luya Tshimbalanga
commit 9a57bcfb07aab6155b18205c3fa9876eb6f268ad
Merge: d275ae9 6aa8533
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Oct 16 20:30:04 2013 -0700
design: add tutorials list lnk
fedora-arm-base.ks | 10 +++++-
fedora-live-base.ks | 2 +-
fedora-live-design-suite.ks | 18 +++++++---
fedora-live-jam-kde.ks | 3 ++
fedora-live-kde-base.ks | 7 ++--
fedora-livecd-desktop.ks | 9 +++++
fedora-livecd-mate-compiz.ks | 21 ++++++++++-
fedora-livecd-security.ks | 32 +++++++++++++++---
fedora-livecd-soas.ks | 10 +++++
fedora-livedvd-electronic-lab.ks | 5 ++-
fedora-livedvd-scientific-kde.ks | 69 +++++++++++++++++++++++++++----------
fedora-repo-not-rawhide.ks | 4 +-
fedora-soas-packages.ks | 2 +
13 files changed, 151 insertions(+), 41 deletions(-)
---
diff --cc fedora-live-design-suite.ks
index b5e2698,16fbec7..1cd6a23
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@@ -118,13 -116,13 +116,23 @@@ Categories=Graphics;Documentation
FOE
chmod a+x /usr/share/applications/inkscape-course.desktop
++<<<<<<< HEAD
+# Add link to lists of tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=List of design tutorials
+Comment=Reference of design related tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
++=======
+ # 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
++>>>>>>> 6aa8533f0e92ff46ad7952e5cbd11458bad3d7fa
Type=Application
Icon=applications-graphics
Categories=Graphics;Documentation;
10 years, 5 months
[spin-kickstarts: 1/2] design: add tutorials list lnk
by Luya Tshimbalanga
commit d275ae9403cc7488ba9daf5bfe78ea30d84ecbac
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Wed Oct 16 20:28:17 2013 -0700
design: add tutorials list lnk
fedora-live-design-suite.ks | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index b10a738..b5e2698 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -118,6 +118,19 @@ Categories=Graphics;Documentation;
FOE
chmod a+x /usr/share/applications/inkscape-course.desktop
+# Add link to lists of tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=List of design tutorials
+Comment=Reference of design related tutorials
+Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+Type=Application
+Icon=applications-graphics
+Categories=Graphics;Documentation;
+FOE
+chmod a+x /usr/share/applications/list-design-tutorials.desktop
+
# rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas
10 years, 5 months
[spin-kickstarts] install dracut-config-generic on arm images to get a generic initramfs remove it in %post so updates
by Dennis Gilmore
commit 6aa8533f0e92ff46ad7952e5cbd11458bad3d7fa
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Oct 16 21:58:04 2013 -0500
install dracut-config-generic on arm images to get a generic initramfs
remove it in %post so updates get host only initramfs's
fedora-arm-base.ks | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index 42a3241..99b5ad3 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -32,6 +32,9 @@ initial-setup
#lets resize / on first boot
dracut-modules-growroot
+# remove this in %post
+dracut-config-generic
+
# install uboot images
uboot-beagle
uboot-beaglebone
@@ -53,5 +56,8 @@ echo "Disabling tmpfs for /tmp."
systemctl mask tmp.mount
/usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic
+
%end
10 years, 5 months
[spin-kickstarts/f20] install dracut-config-generic on arm images to get a generic initramfs remove it in %post so updates
by Dennis Gilmore
commit d22816d5ff9056464937e9af14eeea5e69a1063c
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Wed Oct 16 21:58:04 2013 -0500
install dracut-config-generic on arm images to get a generic initramfs
remove it in %post so updates get host only initramfs's
fedora-arm-base.ks | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index f3ee21f..58ea91f 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -30,6 +30,9 @@ initial-setup
#lets resize / on first boot
dracut-modules-growroot
+# remove this in %post
+dracut-config-generic
+
# install uboot images
uboot-beagle
uboot-beaglebone
@@ -51,5 +54,8 @@ echo "Disabling tmpfs for /tmp."
systemctl mask tmp.mount
/usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic
+
%end
10 years, 5 months