From 25122844450e3cfa150f580676a9a54e4e42c970 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 8 May 2011 22:35:49 +0200 Subject: [PATCH 1/6] Design Suite: Fixes for F15 / GNOME 3 --- fedora-livecd-design-suite.ks | 105 +++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 32 deletions(-) diff --git a/fedora-livecd-design-suite.ks b/fedora-livecd-design-suite.ks index 38564e5..ccd8517 100644 --- a/fedora-livecd-design-suite.ks +++ b/fedora-livecd-design-suite.ks @@ -12,11 +12,9 @@ # gnome desktop gdm -gnome-python2-gconf -gnome-desktop gnome-panel gnome-session -gnome-terminal +gnome-shell metacity nautilus @@ -24,20 +22,20 @@ nautilus agave blender cinepaint -entangle +# entangle # does not work in a gtk+ 3 environment fontforge fontmatrix # fyre gimp gimp-*-plugin GREYCstoration-gimp -# hugin +# hugin # is huge inkscape mypaint nautilus-image-converter optipng -# pinta -# postr +# pinta # is huge because it needs mono +postr rawtherapee scribus shotwell @@ -51,7 +49,7 @@ dia evince gnote gnumeric -hamster-applet +# hamster-applet # no more applets in gnome-shell # pdfmod # internet @@ -60,13 +58,14 @@ evolution firefox # audio & video -jokosher +# jokosher # no longer available pitivi rhythmbox totem # system gedit +gnome-terminal gnome-utils gtk-recordmydesktop NetworkManager-gnome @@ -76,43 +75,85 @@ NetworkManager-gnome %post cat >> /etc/rc.d/init.d/livesys << EOF # 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 -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/gnome/lockdown/disable_lock_screen true >/dev/null - -# set up timed auto-login for after 60 seconds -cat >> /etc/gdm/custom.conf << FOE -[daemon] -TimedLoginEnable=true -TimedLogin=liveuser -TimedLoginDelay=60 +cat >> /usr/share/glib-2.0/schemas/org.gnome.desktop.screensaver.gschema.override << FOE +[org.gnome.desktop.screensaver] +lock-enabled=false FOE -# Show harddisk install on the desktop -sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop -mkdir /home/liveuser/Desktop -cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop -chown -R liveuser.liveuser /home/liveuser/Desktop -chmod a+x /home/liveuser/Desktop/liveinst.desktop +# 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 -# But not trash and home -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/trash_icon_visible false >/dev/null -gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/nautilus/desktop/home_icon_visible false >/dev/null +# 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=['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 -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 -cat >> /home/liveuser/Desktop/inkscape-course.desktop << FOE -#!/usr/bin/env xdg-open +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=/usr/bin/firefox http://linuxgrrl.com/learn/Introduction_To_Inkscape +Exec=xdg-open http://linuxgrrl.com/learn/Introduction_To_Inkscape Type=Application Icon=fedora-logo-icon +Categories=Graphics;Documentation; FOE -chmod a+x /home/liveuser/Desktop/inkscape-course.desktop +chmod a+x /usr/share/applications/inkscape-course.desktop EOF From 5e3c998ac1542a295d9d54dae392c02fb89ec74c Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 17 May 2011 21:53:29 +0200 Subject: [PATCH 2/6] LXDE: Add xscreensaver-extras (#705217) --- fedora-livecd-lxde.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index 8a895be..45ebf47 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -70,6 +70,7 @@ perl-File-MimeInfo xcompmgr xdg-user-dirs-gtk +xscreensaver-extras # use yumex instead of gnome-packagekit yumex From cf02434d190aab6aeeb74a2a99384d8a7aaeb770 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Fri, 20 May 2011 07:12:46 -0500 Subject: [PATCH 3/6] Do initial F16 build. --- spin-kickstarts.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spin-kickstarts.spec.in b/spin-kickstarts.spec.in index 5a7cde7..9fbe470 100644 --- a/spin-kickstarts.spec.in +++ b/spin-kickstarts.spec.in @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/%{name}/l10n/README %changelog +* Fri May 20 2011 Bruno Wolff III 0.16.0-1 +- Initial F16 build + * Fri Apr 01 2011 Bruno Wolff III 0.15.4-1 - Enough has changed that it seems worth doing a new beta build From 1a21086dbe5cc848e34e46a332b5390f22a4c666 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Sat, 21 May 2011 00:27:52 -0500 Subject: [PATCH 4/6] Remove references to hal-storage-addon. hal-storage-addon has been retired for F16. --- fedora-livecd-lxde.ks | 1 - fedora-livecd-security.ks | 1 - 2 files changed, 2 deletions(-) diff --git a/fedora-livecd-lxde.ks b/fedora-livecd-lxde.ks index 45ebf47..32f1b73 100644 --- a/fedora-livecd-lxde.ks +++ b/fedora-livecd-lxde.ks @@ -62,7 +62,6 @@ adwaita-gtk3-theme # needed for automatic unlocking of keyring (#643435) gnome-keyring-pam -hal-storage-addon NetworkManager-gnome # needed for xdg-open to support LXDE diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks index f839e1f..1662948 100644 --- a/fedora-livecd-security.ks +++ b/fedora-livecd-security.ks @@ -56,7 +56,6 @@ adwaita-gtk3-theme gnome-keyring-pam gnome-bluetooth -hal-storage-addon # needed for xdg-open to support LXDE perl-File-MimeInfo From e89b41a9f0eed579647599745f9b42879c08489b Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 6 Jun 2011 00:19:15 +0200 Subject: [PATCH 5/6] Xfce: Remove orphaned parole-mozplugin --- fedora-livecd-xfce.ks | 1 - 1 file changed, 1 deletion(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index bd7198f..6307bc6 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -58,7 +58,6 @@ cheese quodlibet pavucontrol parole -parole-mozplugin xfburn # System From 38cf085584c7be5af26835ff8ed84f972cb6b3d4 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 6 Jun 2011 00:20:22 +0200 Subject: [PATCH 6/6] Xfce: xfce4-cddrive-plugin is dead, remove it completely --- fedora-livecd-xfce.ks | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks index 6307bc6..0d83798 100644 --- a/fedora-livecd-xfce.ks +++ b/fedora-livecd-xfce.ks @@ -109,8 +109,6 @@ thunar-volman thunar-media-tags-plugin xarchiver xfce4-battery-plugin -# we already have thunar-volman -#xfce4-cddrive-plugin xfce4-cellmodem-plugin xfce4-clipman-plugin xfce4-cpugraph-plugin