From 4758a2aa80d9d82be695a9905119f5fb32ba4884 Mon Sep 17 00:00:00 2001 From: Chris Lumens Date: Wed, 18 Jan 2012 13:16:15 -0500 Subject: [PATCH] Add packages required for gtk3 and the new anaconda UI. This doesn't get rid of the gtk2 stuff yet, though. The intention here is that you can use this lorax to generate an image containing either the old anaconda or the newui branch, simply by including a different repo in your tree composition kickstart file. Also, it appears that some things in the tree still require gtk2 so we may be stuck with both for the forseeable future. --- share/runtime-cleanup.tmpl | 10 +++++++--- share/runtime-install.tmpl | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl index 546009cc..e7aed0ea 100644 --- a/share/runtime-cleanup.tmpl +++ b/share/runtime-cleanup.tmpl @@ -48,8 +48,8 @@ remove /etc/logrotate.d removepkg avahi-autoipd coreutils-libs curl dash db4-utils diffutils file removepkg fipscheck genisoimage gnome-python2 info iptables isomd5sum removepkg jasper-libs libIDL libXt libXxf86misc libXxf86vm -removepkg libasyncns libcroco libdaemon libevent libhbaapi libhbalinux -removepkg libmcpp libpcap librsvg2 libtiff libutempter linux-atm-libs +removepkg libasyncns libdaemon libevent libhbaapi libhbalinux +removepkg libmcpp libpcap libtiff libutempter linux-atm-libs removepkg lvm2-libs m4 mailx makebootfat mcpp removepkg mingetty mobile-broadband-provider-info pkgconfig ppp pth removepkg rmt rpcbind shared-mime-info squashfs-tools system-config-firewall-base @@ -100,6 +100,8 @@ removefrom gtk2 /usr/share/themes/* ## clearlooks is the theme we use for gtk2 removefrom gtk2-engines --allbut /usr/${libdir}/*/libclearlooks.so \ /usr/share/themes/Clearlooks/* +removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/* +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/* @@ -184,7 +186,6 @@ removefrom firstboot /lib/systemd/* /usr/sbin/* /usr/share/firstboot/* removefrom firstboot /usr/share/locale/* removefrom fontconfig /usr/bin/* removefrom gawk /usr/bin/* /usr/libexec/* /usr/share/* -removefrom gdk-pixbuf2 /usr/${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/* removefrom gdk-pixbuf2 /usr/share/locale* removefrom gfs2-utils /usr/sbin/* removefrom glib2 /etc/* /usr/bin/* /usr/share/locale/* @@ -214,6 +215,7 @@ removefrom grub2 /sbin/* /usr/bin/* removefrom gstreamer /usr/bin/* /usr/${libdir}/gstreamer-0.10/* removefrom gstreamer /usr/${libdir}/libgst* /usr/libexec/* /usr/share/locale/* removefrom gtk2 /usr/bin/update-gtk-immodules +removefrom gtk3 /usr/bin/update-gtk-immodules removefrom gtk3 /usr/share/* /usr/${libdir}/gtk-3.0/* removefrom gtk3 /usr/${libdir}/libgailutil* removefrom gzip /usr/bin/* @@ -238,6 +240,7 @@ removefrom libcanberra-gtk2 /usr/${libdir}/gtk-2.0/* removefrom libcanberra-gtk3 /usr/bin/* /usr/${libdir}/* removefrom libcap /usr/sbin/* removefrom libconfig /usr/${libdir}/libconfig++* +removefrom libcroco /usr/bin/* removefrom libgnome-keyring /usr/share/locale/* removefrom libgnomecanvas /usr/share/locale/* removefrom libgpg-error /usr/bin/* /usr/share/locale/* @@ -246,6 +249,7 @@ removefrom libidn /usr/bin/* /usr/share/locale/* removefrom libmlx4 /etc/rdma/* /usr/${libdir}/* removefrom libnotify /usr/bin/* removefrom libpng /usr/${libdir}/libpng.* +removefrom librsvg2 /usr/bin/* removefrom libselinux /sbin/* removefrom libsemanage /etc/selinux/* removefrom libstdc++ /usr/share/* diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl index 14ac62c9..ad75582d 100644 --- a/share/runtime-install.tmpl +++ b/share/runtime-install.tmpl @@ -2,7 +2,7 @@ <%page args="basearch, product"/> ## anaconda package -installpkg anaconda +installpkg anaconda anaconda-widgets ## anaconda deps that aren't in the RPM installpkg firstboot @@ -50,6 +50,7 @@ installpkg NetworkManager-gnome installpkg at-spi at-spi2-atk pyatspi installpkg gnome-python2-gconf installpkg gobject-introspection +installpkg librsvg2 installpkg polkit-desktop-policy installpkg gnome-keyring installpkg python-imaging