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

This commit is contained in:
Peter Robinson 2011-06-12 12:12:27 +01:00
commit c3a1adefdc
5 changed files with 77 additions and 37 deletions

View File

@ -12,11 +12,9 @@
# gnome desktop # gnome desktop
gdm gdm
gnome-python2-gconf
gnome-desktop
gnome-panel gnome-panel
gnome-session gnome-session
gnome-terminal gnome-shell
metacity metacity
nautilus nautilus
@ -24,20 +22,20 @@ nautilus
agave agave
blender blender
cinepaint cinepaint
entangle # entangle # does not work in a gtk+ 3 environment
fontforge fontforge
fontmatrix fontmatrix
# fyre # fyre
gimp gimp
gimp-*-plugin gimp-*-plugin
GREYCstoration-gimp GREYCstoration-gimp
# hugin # hugin # is huge
inkscape inkscape
mypaint mypaint
nautilus-image-converter nautilus-image-converter
optipng optipng
# pinta # pinta # is huge because it needs mono
# postr postr
rawtherapee rawtherapee
scribus scribus
shotwell shotwell
@ -51,7 +49,7 @@ dia
evince evince
gnote gnote
gnumeric gnumeric
hamster-applet # hamster-applet # no more applets in gnome-shell
# pdfmod # pdfmod
# internet # internet
@ -60,13 +58,14 @@ evolution
firefox firefox
# audio & video # audio & video
jokosher # jokosher # no longer available
pitivi pitivi
rhythmbox rhythmbox
totem totem
# system # system
gedit gedit
gnome-terminal
gnome-utils gnome-utils
gtk-recordmydesktop gtk-recordmydesktop
NetworkManager-gnome NetworkManager-gnome
@ -76,43 +75,85 @@ NetworkManager-gnome
%post %post
cat >> /etc/rc.d/init.d/livesys << EOF cat >> /etc/rc.d/init.d/livesys << EOF
# disable screensaver locking # 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 cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null [org.gnome.desktop.screensaver]
lock-enabled=false
# set up timed auto-login for after 60 seconds
cat >> /etc/gdm/custom.conf << FOE
[daemon]
TimedLoginEnable=true
TimedLogin=liveuser
TimedLoginDelay=60
FOE FOE
# Show harddisk install on the desktop # and hide the lock screen option
sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.lockdown.gschema.override << FOE
mkdir /home/liveuser/Desktop [org.gnome.desktop.lockdown]
cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop disable-lock-screen=true
chown -R liveuser.liveuser /home/liveuser/Desktop FOE
chmod a+x /home/liveuser/Desktop/liveinst.desktop
# But not trash and home # disable updates plugin
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null cat >> /usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override << FOE
gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null [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=['mozilla-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 # Turn off PackageKit-command-not-found while uninstalled
sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf 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 # Add link to the Inkscape Course
cat >> /home/liveuser/Desktop/inkscape-course.desktop << FOE cat >> /usr/share/applications/inkscape-course.desktop << FOE
#!/usr/bin/env xdg-open
[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=/usr/bin/firefox 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;
FOE FOE
chmod a+x /home/liveuser/Desktop/inkscape-course.desktop chmod a+x /usr/share/applications/inkscape-course.desktop
EOF EOF

View File

@ -62,7 +62,6 @@ adwaita-gtk3-theme
# needed for automatic unlocking of keyring (#643435) # needed for automatic unlocking of keyring (#643435)
gnome-keyring-pam gnome-keyring-pam
hal-storage-addon
NetworkManager-gnome NetworkManager-gnome
# needed for xdg-open to support LXDE # needed for xdg-open to support LXDE
@ -70,6 +69,7 @@ perl-File-MimeInfo
xcompmgr xcompmgr
xdg-user-dirs-gtk xdg-user-dirs-gtk
xscreensaver-extras
# use yumex instead of gnome-packagekit # use yumex instead of gnome-packagekit
yumex yumex

View File

@ -56,7 +56,6 @@ adwaita-gtk3-theme
gnome-keyring-pam gnome-keyring-pam
gnome-bluetooth gnome-bluetooth
hal-storage-addon
# needed for xdg-open to support LXDE # needed for xdg-open to support LXDE
perl-File-MimeInfo perl-File-MimeInfo

View File

@ -58,7 +58,6 @@ cheese
quodlibet quodlibet
pavucontrol pavucontrol
parole parole
parole-mozplugin
xfburn xfburn
# System # System
@ -110,8 +109,6 @@ thunar-volman
thunar-media-tags-plugin thunar-media-tags-plugin
xarchiver xarchiver
xfce4-battery-plugin xfce4-battery-plugin
# we already have thunar-volman
#xfce4-cddrive-plugin
xfce4-cellmodem-plugin xfce4-cellmodem-plugin
xfce4-clipman-plugin xfce4-clipman-plugin
xfce4-cpugraph-plugin xfce4-cpugraph-plugin

View File

@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{name}/l10n/README %doc %{_datadir}/%{name}/l10n/README
%changelog %changelog
* Fri May 20 2011 Bruno Wolff III <bruno@wolff.to> 0.16.0-1
- Initial F16 build
* Fri Apr 01 2011 Bruno Wolff III <bruno@wolff.to> 0.15.4-1 * Fri Apr 01 2011 Bruno Wolff III <bruno@wolff.to> 0.15.4-1
- Enough has changed that it seems worth doing a new beta build - Enough has changed that it seems worth doing a new beta build