diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-06-30 18:19:54 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-06-30 18:19:54 +0000 |
| commit | c4e4737fa281b32a00ef482a50ce802b4d3ab5b2 (patch) | |
| tree | 19498b1c35a08004260e2071c10c7c677a33c438 /scripts | |
| parent | 26d782961329c486095369786e9cffc4e48f24e4 (diff) | |
take $another at fixing the pixbuf nonsense
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/upd-instroot | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 9cbb372c9..7c1cb2ed8 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -921,13 +921,16 @@ ModuleFiles=/etc/pango/pango.modules EOF fi +HOSTTRIPLET=`rpm --nodigest --nosignature -qp --qf "%{POSTIN}\n" $PACKAGEDIR/gtk2*.rpm |grep update-gdk-pixbuf |awk {'print $2;'}` +mkdir -p $DESTGR/etc/gtk-2.0/$HOSTTRIPLET + echo "Getting gtk2 input method modules" if [ -n "$NEEDGR" ]; then mv $DESTGR/usr/bin/gtk-query-immodules-2.0* $DESTGR/usr/bin/gtk-query-immodules-2.0 if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then - runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 2> $DESTGR/etc/gtk-2.0/gtk.immodules" + runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules" else - LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/gtk.immodules + LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gtk-query-immodules-2.0 > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gtk.immodules fi rm -f $DESTGR/usr/bin/gtk-query-immodules-2.0 fi @@ -936,9 +939,9 @@ echo "Getting gtk2 gdk-pixbuf loaders" if [ -n "$NEEDGR" ]; then mv $DESTGR/usr/bin/gdk-pixbuf-query-loaders* $DESTGR/usr/bin/gdk-pixbuf-query-loaders if [ -x /usr/bin/runroot -a -n "$COMPONENT" ]; then - runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders 2> $DESTGR/etc/gtk-2.0/gdk-pixbuf.loaders" + runroot $COMPONENT --onlyone --arch $ARCH "LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders 2> $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders" else - LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/gdk-pixbuf.loaders + LD_LIBRARY_PATH=/usr/X11R6/$LIBDIR:$LD_LIBRARY_PATH /usr/sbin/chroot $DESTGR /usr/bin/gdk-pixbuf-query-loaders > $DESTGR/etc/gtk-2.0/$HOSTTRIPLET/gdk-pixbuf.loaders fi rm -f $DESTGR/usr/bin/gdk-pixbuf-query-loaders fi |