diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-11-08 20:02:10 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-11-08 20:02:10 +0000 |
| commit | 7559130d9be97f8d9f936f56f310378c8a90f4d8 (patch) | |
| tree | 8c2efcf98b92fa23410f312bca3e68aef048bc18 | |
| parent | 3ffc3c0eac0babfba7e90f3fcd96b6a7656dd3e5 (diff) | |
| download | anaconda-7559130d9be97f8d9f936f56f310378c8a90f4d8.tar.gz anaconda-7559130d9be97f8d9f936f56f310378c8a90f4d8.tar.xz anaconda-7559130d9be97f8d9f936f56f310378c8a90f4d8.zip | |
gdk-pixbuf loaders have to be queried with gtk 2.1.x
| -rwxr-xr-x | scripts/upd-instroot | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 1a2822049..4d5f3a7be 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -523,6 +523,7 @@ usr/bin/chattr* usr/bin/ftp usr/bin/fc-cache usr/bin/gtk-query* +usr/bin/gdk-pixbuf-query-loaders usr/bin/head usr/bin/less usr/bin/lsattr* @@ -763,13 +764,25 @@ echo "Getting gtk2 input method modules" if [ -n "$NEEDGR" ]; then if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then REALPATH=`(cd $DESTGR; /bin/pwd | sed 's,/md1/,/,g')` - runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/lib:$LD_LIBRARY_PATH /usr/sbin/chroot $REALPATH /usr/bin/gtk-query-immodules-2.0 2> $REALPATH/etc/gtk-2.0/gtk.immodules" + runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/lib:$LD_LIBRARY_PATH /usr/sbin/chroot $REALPATH /usr/bin/gtk-query-immodules-2.0 > $REALPATH/etc/gtk-2.0/gtk.immodules" else LD_LIBRARY_PATH=/usr/X11R6/lib:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/gtk.immodules fi rm -f $DESTGR/usr/bin/gtk-query-immodules-2.0 fi +echo "Getting gtk2 gdk-pixbuf loaders" +if [ -n "$NEEDGR" ]; then + if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then + /usr/bin/gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders + runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/lib:$LD_LIBRARY_PATH /usr/sbin/chroot $REALPATH /usr/bin/gdk-pixbuf-query-loaders 2> $REALPATH/etc/gtk-2.0/gdk-pixbuf.loaders" + else + LD_LIBRARY_PATH=/usr/X11R6/lib:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/gdk-pixbuf.loaders + fi + rm -f $DESTGR/usr/bin/gdk-pixbuf-query-loaders + +fi + # make the changes we want to fonts.conf for anaconda (#65913) if [ -n "$NEEDGR" ]; then echo -n "Munging fonts.conf" |