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

This commit is contained in:
Jeroen van Meeuwen (Fedora Unity) 2009-08-04 00:53:55 +02:00
commit 854e261e67
6 changed files with 209 additions and 119 deletions

View File

@ -27,7 +27,6 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
# To compose against local trees, (edit and) use:
#repo --name=f11 --baseurl=http://localrepo/fedora/releases/11/Everything/$basearch/os/
#repo --name=f11-updates --baseurl=http://localrepo/fedora/updates/11/$basearch/
%packages
@base-x
@ -375,10 +374,6 @@ fi
EOF
# workaround avahi segfault (#279301)
touch /etc/resolv.conf
/sbin/restorecon /etc/resolv.conf
chmod 755 /etc/rc.d/init.d/livesys
/sbin/restorecon /etc/rc.d/init.d/livesys
/sbin/chkconfig --add livesys

View File

@ -28,7 +28,6 @@ broffice.org-*
# Include some desktop packages
@java
totem-xine
vino
gnome-games
system-config-display
@ -40,8 +39,6 @@ bitstream-vera-*
-abyssinica-fonts
-jomolhari-fonts
-lohit-*
-kacst-fonts
-paktype-fonts
-baekmuk-*
-vlgothic-fonts-*
-padauk-fonts

View File

@ -2,6 +2,12 @@
# http://fedoraproject.org/wiki/SIGs/Desktop
# mailto:fedora-desktop-list@redhat.com
# NOTE!
#
# This kickstart file is non-branded to facilitate doing test spins
# without trademark complications. You NEED to remove the debranding
# lines below when doing official spins.
%include fedora-live-base.ks
%packages
@ -35,7 +41,6 @@ festvox-slt-arctic-hts
-gimp-help-browser
-gimp-data-extras
-evolution-help
-gnome-games
-gnome-games-help
-nss_db
-vino
@ -43,15 +48,25 @@ festvox-slt-arctic-hts
-dasher
-evince-dvi
-evince-djvu
# not needed for gnome
-acpid
-wget
-desktop-backgrounds-basic
# these pull in excessive dependencies
-ekiga
-tomboy
-f-spot
# things we don't need here
-seahorse
-alacarte
-krb5-auth-dialog
-krb5-workstation
-pam_krb5
-quota
-acpid
-nano
-smartmontools
-minicom
# drop some system-config things
-system-config-boot
-system-config-language
@ -60,6 +75,18 @@ festvox-slt-arctic-hts
-system-config-rootpassword
-system-config-services
-policycoreutils-gui
# use the PackageKit helper for bash
PackageKit-command-not-found
# why does the obsoletes not work ?!
-lzma
xz-lzma-compat
# debrand test spins. Remove this for official releases !
-fedora-logos
generic-logos
%end
%post

View File

@ -1,106 +0,0 @@
# fedora-livecd-education.ks
#
# Description:
# - Fedora Live Spin including mainly software for educational purposes
#
# Maintainers:
# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
# - Fedora Education SIG
%include fedora-live-base.ks
# please don't forget to adjust the instLangs argument
# if you are going to create a localized spin
%packages --excludedocs --instLangs en_US
# desktop environments
@sugar-desktop
@xfce-desktop
# education
avogadro
kdeedu
# internet
alpine
empathy
firefox
# office
abiword
gnumeric
evince
# graphics
blender
inkscape
gimp
mirage
# audio & video
totem
totem-gstreamer
totem-mozplugin
-totem-xine
-xine-lib
# others
geany
gnash-plugin
# system
alsa-plugins-pulseaudio
desktop-backgrounds-compat
gnome-power-manager
liveusb-creator
NetworkManager-gnome
pavucontrol
setroubleshoot
xdg-user-dirs
# remove imsettings-xfce for now until it gets re-written
-imsettings-xfce
# dictionaries are big
-aspell-*
-hunspell-*
-man-pages-*
-words
# exclude input methods
-scim*
-m17n*
# save some space
-autofs
-nss_db
-sendmail
ssmtp
-acpid
-isdn4k-utils
-gimp-help
-gimp-help-browser
%post
# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
PREFERRED=/usr/bin/startxfce4
EOF
cat >> /etc/rc.d/init.d/livesys << EOF
chown -R liveuser:liveuser /home/liveuser
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
cat >> /etc/gdm/custom.conf << FOE
[daemon]
TimedLoginEnable=true
TimedLogin=liveuser
TimedLoginDelay=60
FOE
EOF
%end

View File

@ -19,6 +19,8 @@ NetworkManager-openvpn
NetworkManager-gnome
NetworkManager-pptp
gparted
# Add the midori browser as a lighter alternative
midori
@ -35,7 +37,7 @@ evince
gimp
inkscape
galculator
gcalctool
desktop-backgrounds-compat
gnome-screensaver
setroubleshoot
@ -50,6 +52,21 @@ totem
totem-mozplugin
pidgin
claws-mail
claws-mail-plugins-archive
claws-mail-plugins-att-remover
claws-mail-plugins-attachwarner
claws-mail-plugins-bogofilter
claws-mail-plugins-cachesaver
claws-mail-plugins-fetchinfo
claws-mail-plugins-mailmbox
claws-mail-plugins-newmail
claws-mail-plugins-notification
claws-mail-plugins-pgp
claws-mail-plugins-rssyl
claws-mail-plugins-smime
claws-mail-plugins-spam-report
claws-mail-plugins-tnef
claws-mail-plugins-vcalendar
xfburn
liferea
quodlibet

160
fedora-livedvd-education.ks Normal file
View File

@ -0,0 +1,160 @@
# fedora-livedvd-education.ks
#
# Description:
# - Fedora Live Spin with the purpose to create a ready-to-go
# development environment for contributing to educational
# projects inside, but also outside of the Fedora ecosystem.
#
# Maintainers:
# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
# - Fedora Education SIG
%include fedora-live-base.ks
# we need more space now
part / --size=8192
%packages
# desktop environments
@gnome-desktop
@sugar-desktop
sugar-emulator
# education
gnuplot
kdeedu
moodle
octave
# internet
# education-bookmarks
firefox
java-1.6.0-openjdk-plugin
xchat-gnome
# office
evince
openoffice.org-calc
openoffice.org-impress
openoffice.org-math
openoffice.org-writer
# graphics
gimp
inkscape
# audio & video
totem
totem-mozplugin
# stuff to make sugar-jhbuild work out of the box
avahi-gobject-devel
avahi-tools
enchant-devel
fribidi-devel
icon-naming-utils
icon-slicer
libcroco-devel
libffi-devel
libgsf-devel
librsvg2-devel
loudmouth-devel
olpcsound-devel
poppler-glib-devel
python-distutils-extra
redhat-lsb
wv-devel
xulrunner-devel-unstable
xulrunner-python-devel
# development
@development-libs
@development-tools
@fedora-packager
@gnome-software-development
giggle
numpy
pygame
# eclipse environment
@eclipse
eclipse-eclox
# eclipse-texlipse
# virtualization
@virtualization
# additional removals from gnome
-evolution
-gok
-gthumb
-nautilus-sendto
-orca
-tomboy
# remove some sugar packages
-sugar-finance
-sugar-help
-sugar-xoirc
-sugar-xomail
# dictionaries are big
-aspell-*
-hunspell-*
-man-pages-*
-words
# exclude input methods
-scim*
-m17n*
# save some space
-gnome-user-docs
-nss_db
-vino
-isdn4k-utils
-dasher
-tomboy
# not needed for gnome
-acpid
%end
%post
cat >> /etc/rc.d/init.d/livesys << EOF
# enable the logout menu item in Sugar
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout true >/dev/null
# disable screensaver locking
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
# set up timed auto-login for after 60 seconds
cat >> /etc/gdm/custom.conf << FOE
[daemon]
TimedLoginEnable=true
TimedLogin=liveuser
TimedLoginDelay=60
FOE
# create file for xchat default servers
mkdir -p /home/liveuser/.xchat-gnome
cat >> /home/liveuser/.xchat-gnome/servlist_.conf << FOE
v=0.26.0
N=FreeNode
J=#fedora-edu,#sugar,#teachingopensource
F=3
D=0
S=irc.freenode.net
FOE
chown liveuser:liveuser /home/liveuser/.xchat-gnome/servlist_.conf
EOF
%end