From 41896c82c47c517f5a7fff282b93b9f7a068c21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Tue, 24 Mar 2015 00:32:06 +0100 Subject: [PATCH] lorax: keep GTK theme installed, minor cleanup --- lorax-templates-qubes/templates/runtime-cleanup.tmpl | 3 --- lorax-templates-qubes/templates/runtime-install.tmpl | 2 +- lorax-templates-qubes/templates/runtime-postinstall.tmpl | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/lorax-templates-qubes/templates/runtime-cleanup.tmpl b/lorax-templates-qubes/templates/runtime-cleanup.tmpl index b2c48bd..0964c2d 100644 --- a/lorax-templates-qubes/templates/runtime-cleanup.tmpl +++ b/lorax-templates-qubes/templates/runtime-cleanup.tmpl @@ -110,9 +110,6 @@ removefrom gtk3 /usr/share/themes/* ## the Fedora icon theme inherits from Mist, so we need that removefrom gnome-themes --allbut /usr/share/icons/Mist/* \ /usr/share/themes/Clearlooks/* -## Adwaita is the default theme for gtk3 and the default metacity theme -removefrom gnome-themes-standard --allbut /usr/share/themes/Adwaita/* -removefrom metacity --allbut /usr/bin/* /usr/${libdir}/* /etc/* ## filesystem tools removefrom e2fsprogs /usr/share/locale/* diff --git a/lorax-templates-qubes/templates/runtime-install.tmpl b/lorax-templates-qubes/templates/runtime-install.tmpl index 24af939..73ea772 100644 --- a/lorax-templates-qubes/templates/runtime-install.tmpl +++ b/lorax-templates-qubes/templates/runtime-install.tmpl @@ -4,7 +4,7 @@ installpkg python ## anaconda package -installpkg anaconda anaconda-widgets +installpkg anaconda ## anaconda deps that aren't in the RPM installpkg tmux installpkg iscsi-initiator-utils diff --git a/lorax-templates-qubes/templates/runtime-postinstall.tmpl b/lorax-templates-qubes/templates/runtime-postinstall.tmpl index 8a530be..2f628aa 100644 --- a/lorax-templates-qubes/templates/runtime-postinstall.tmpl +++ b/lorax-templates-qubes/templates/runtime-postinstall.tmpl @@ -104,10 +104,6 @@ gconfset /apps/metacity/global_keybindings/switch_windows string disabled gconfset /desktop/gnome/interface/accessibility bool true gconfset /desktop/gnome/interface/at-spi-corba bool true -## Make sure we have a GTK theme -mkdir etc/gtk-3.0/ -copy usr/share/gtk-3.0/settings.ini etc/gtk-3.0/ - ## Some settings are controlled by gsettings now. install ${configdir}/org.gnome.desktop.wm.keybindings.gschema.override usr/share/glib-2.0/schemas install ${configdir}/org.gnome.desktop.wm.preferences.gschema.override usr/share/glib-2.0/schemas