From 6891990ed45f73bf709937ec355e199e5787dfe3 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Jan 30 2013 05:39:17 +0000 Subject: Merge branch 'master' of ssh://git.fedorahosted.org/git/spin-kickstarts --- diff --git a/Makefile.am b/Makefile.am index edbb3a7..faca3b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,13 +9,13 @@ fedora_DATA = \ fedora-live-mini.ks \ fedora-live-desktop.ks \ fedora-livecd-desktop.ks \ + fedora-live-design-suite.ks \ fedora-live-kde.ks \ fedora-livecd-kde.ks \ fedora-live-kde-base.ks \ fedora-livecd-lxde.ks \ fedora-livecd-soas.ks \ fedora-livecd-xfce.ks \ - fedora-livedvd-design-suite.ks \ fedora-livedvd-electronic-lab.ks \ fedora-livedvd-games.ks \ fedora-livedvd-robotics.ks \ diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks new file mode 100644 index 0000000..9b4a63c --- /dev/null +++ b/fedora-live-design-suite.ks @@ -0,0 +1,91 @@ +# fedora-design-suite.ks +# Based on Live Desktop +# Description: +# - A Spin targeted towards professional designers +# Website: http://fedoraproject.org/wiki/Design_Suite +# Maintainers: +# - Luya Tshimbalanga +# - Sebastian Dziallas + +%include fedora-live-desktop.ks + +#DVD size partition +part / --size 4096 + +%packages + +# graphics +blender +bluefish # designer can build website +cinepaint # enabled for HDR pictures support +cmyktool +darktable # replaces rawtherapee as default +dia +entangle +fontforge +font-manager # replaces fontmatrix +gimp +gimp-*-plugin +GREYCstoration-gimp +hugin # reintroduced +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 +# ufraw # dropped as duplicate of darktable +xournal + +# office +gnote +pdfshuffler #replaces pdfmod which needs mono dependencies + +# internet +filezilla + +# audio & video +audacity +pitivi + +# system +# gtk-recordmydesktop # dropped for space (#887991) +# network-manager-applet #part of Gnome Desktop + +# fonts +aajohan-comfortaa-fonts +adobe-source-sans-pro-fonts +lato-fonts +overpass-fonts + +%end + +%post + +#Include favorite design applications +cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE +[org.gnome.shell] +favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'scribus.desktop', 'nautilus.desktop', 'anaconda.desktop'] +FOE + + +# 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 + +EOF + +%end + diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks index d8e226b..56ee2ea 100644 --- a/fedora-live-desktop.ks +++ b/fedora-live-desktop.ks @@ -18,10 +18,6 @@ nss-mdns # This one needs to be kicked out of @standard -smartmontools -# The gnome-shell team does not want extensions in the default spin; -# ibus support in gnome-shell will be integrated in GNOME 3.4 --ibus-gnome3 - %end %post diff --git a/fedora-live-minimization.ks b/fedora-live-minimization.ks index 88308a3..93d9fa5 100644 --- a/fedora-live-minimization.ks +++ b/fedora-live-minimization.ks @@ -4,7 +4,6 @@ %packages # save some space --samba-client -mpage -sox -hplip diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks index 9a185a7..cf87f55 100644 --- a/fedora-livecd-soas.ks +++ b/fedora-livecd-soas.ks @@ -11,69 +11,10 @@ #%include fedora-live-mini.ks %include fedora-live-base.ks %include fedora-live-minimization.ks +%include fedora-soas-packages.ks firewall --enabled --service=mdns,presence -%packages --@fonts --@dial-up --@multimedia --@printing --foomatic --@gnome-desktop --yp-tools --ypbind --rdate --rdist --icedtea-web --sendmail --firefox --glx-utils --nmap-ncat --PackageKit --libfprint --realmd --eekboard-libs - -# == Core Sugar Platform == -@sugar-desktop - -# Write breaks unless we do this (we don't need it anyway) -# enable for testing in the F17 dev cycle -@input-methods - -# == Platform Components == -# from http://wiki.sugarlabs.org/go/0.94/Platform_Components -alsa-plugins-pulseaudio -alsa-utils -gstreamer1-plugins-base -gstreamer1-plugins-good -gstreamer1-plugins-bad-free -gstreamer-plugins-espeak -pulseaudio -pulseaudio-utils - -# explicitly remove openbox and hopefully deal with what firstboot wants --openbox - -# remove deps that come from god knows where --sane-backends --sane-backends-drivers-scanners - -# Usefulness for DSL connections as per: -# http://bugs.sugarlabs.org/ticket/1951 -rp-pppoe -# Useful for SoaS duplication from: -# http://bugs.sugarlabs.org/ticket/74 -livecd-tools - -# Get the Sugar boot screen --plymouth-system-theme --plymouth-theme-charge -sugar-logos - -%end - %post # Rebuild initrd for Sugar boot screen diff --git a/fedora-livedvd-design-suite.ks b/fedora-livedvd-design-suite.ks deleted file mode 100644 index 151d623..0000000 --- a/fedora-livedvd-design-suite.ks +++ /dev/null @@ -1,162 +0,0 @@ -# fedora-design-suite.ks -# -# Description: -# - A Spin targeted towards professional designers -# -# Maintainers: -# - Luya Tshimbalanga -# - Sebastian Dziallas - -%include fedora-live-mini.ks - -#DVD payload -part / --size 4096 - -%packages - -# gnome desktop -@gnome-desktop --aisleriot --eog --evolution-* - -# graphics -blender -bluefish -cinepaint # enabled for HDR pictures support -cmyktool -darktable # replaces rawtherapee as default -entangle -fontforge -font-manager # replaces fontmatrix -gimp -gimp-*-plugin -GREYCstoration-gimp -hugin # is huge -inkscape -mypaint -nautilus-image-converter -optipng -# pinta # is huge because it needs mono -# postr # dropped because shotwell support flickr upload -scribus -shared-color-profiles-extra -synfigstudio -# ufraw # dropped as duplicate of darktable -xournal - -# office -abiword -dia -gnote -gnumeric -pdfshuffle #replaces pdfmod which needs mono dependencies - -# internet -filezilla -firefox -thunderbird - -# audio & video -audacity -pitivi - -# system -# gtk-recordmydesktop # dropped for space (#887991) -# network-manager-applet #part of Gnome Desktop - -# fonts -aajohan-comfortaa-fonts -google-droid-sans-s*-fonts -lato-fonts -overpass-fonts - -%end - -%post -cat >> /etc/rc.d/init.d/livesys << EOF -# disable screensaver locking -cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE -[org.gnome.desktop.screensaver] -lock-enabled=false -FOE - -# and hide the lock screen option -cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE -[org.gnome.desktop.lockdown] -disable-lock-screen=true -FOE - -# disable updates plugin -cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE -[org.gnome.settings-daemon.plugins.updates] -active=false -FOE - -# make the installer show up -if [ -f /usr/share/applications/liveinst.desktop ]; then - # Show harddisk install in shell dash - sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" - # need to move it to anaconda.desktop to make shell happy - mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop - - cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -[org.gnome.shell] -favorite-apps=['firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop', 'inkscape-course.desktop', 'anaconda.desktop'] -FOE - - # add installer to user menu - mkdir -p ~liveuser/.local/share/gnome-shell/extensions/Installer@shell-extensions.fedoraproject.org - cat >> ~liveuser/.local/share/gnome-shell/extensions/Installer@shell-extensions.fedoraproject.org/metadata.json << FOE -{"shell-version": ["2.91.91"], "uuid": "Installer@shell-extensions.fedoraproject.org", "name": "Installer", "description": "Install OS from user menu"} -FOE - - cat >> ~liveuser/.local/share/gnome-shell/extensions/Installer@shell-extensions.fedoraproject.org/extension.js << FOE -const PopupMenu = imports.ui.popupMenu; -const Shell = imports.gi.Shell; -const Main = imports.ui.main; -const Util = imports.misc.util; - -function main() { - let app = Shell.AppSystem.get_default().get_app('anaconda.desktop'); - let item = new PopupMenu.PopupMenuItem(app.get_name()); - item.connect('activate', function() { app.activate(-1); }); - - Main.panel._statusmenu.menu.addMenuItem(item, Main.panel._statusmenu.menu._getMenuItems().length - 1); -} -FOE - -fi - -# rebuild schema cache with any overrides we installed -glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat >> /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -if [ -f /etc/PackageKit/CommandNotFound.conf ]; then - sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -fi - -# 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 - -EOF - -%end - diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks new file mode 100644 index 0000000..27c2cfd --- /dev/null +++ b/fedora-soas-packages.ks @@ -0,0 +1,70 @@ +# fedora-livecd-soas.ks +# +# Description: +# - A Sugar environment that you can carry in your pocket +# +# Maintainers: +# - Peter Robinson +# - Sebastian Dziallas +# - Mel Chua + + +%packages +-@fonts +-@dial-up +-@multimedia +-@printing +-foomatic +-@gnome-desktop +-yp-tools +-ypbind +-rdate +-rdist +-icedtea-web +-sendmail +-firefox +-glx-utils +-nmap-ncat +-PackageKit +-libfprint +-realmd +-eekboard-libs + +# == Core Sugar Platform == +@sugar-desktop + +# Write breaks unless we do this (we don't need it anyway) +# enable for testing in the F17 dev cycle +@input-methods + +# == Platform Components == +# from http://wiki.sugarlabs.org/go/0.94/Platform_Components +alsa-plugins-pulseaudio +alsa-utils +gstreamer1-plugins-base +gstreamer1-plugins-good +gstreamer1-plugins-bad-free +gstreamer-plugins-espeak +pulseaudio +pulseaudio-utils + +# explicitly remove openbox and hopefully deal with what firstboot wants +-openbox + +# remove deps that come from god knows where +-sane-backends +-sane-backends-drivers-scanners + +# Usefulness for DSL connections as per: +# http://bugs.sugarlabs.org/ticket/1951 +rp-pppoe +# Useful for SoaS duplication from: +# http://bugs.sugarlabs.org/ticket/74 +livecd-tools + +# Get the Sugar boot screen +-plymouth-system-theme +-plymouth-theme-charge +sugar-logos + +%end