- apply optflags patch

[packages/anaconda.git] / anaconda-upd-instroot

diff --git a/anaconda-upd-instroot b/anaconda-upd-instroot
index d7a567db10643191f2d233db41e882a50e1c3a37..3b405d893111aed6c0f12b24416ac6b3290b218f 100644 (file)
--- a/anaconda-upd-instroot
+++ b/anaconda-upd-instroot
@@ -111,17 +111,17 @@ mkdir -p $DESTGR
 
 PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
         libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt
-        procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
+        procps rpm rpm-lib XFree86 Xconfigurator anaconda tzdata
         anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage
         bzip2-libs dosfstools pciutils reiserfsprogs parted sed
-        busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper dlm
-        rhpl pyxf86config libxml2 libxml2-python glib2 sqlite neon
+        busybox-anaconda python-rpm python-booty hdparm lvm2 beecrypt device-mapper dlm
+        python-rhpl pyxf86config libxml2 python-libxml2 glib2 sqlite neon
         elfutils-libelf krb5-libs convertdb1 jfsutils
         xfsprogs xfsdump dmapi libacl libattr attr acl python-urlgrabber
-         policy policycoreutils pyparted xorg-x11 selinux-policy-targeted
+         policy policycoreutils pyparted X11 X11-tools selinux-policy-targeted
         libstdc++ expat libgcc readline ncurses yum python-sqlite
         python-elementtree pykickstart e2fsprogs-libs iscsi-initiator-utils
-        db4"
+        db4 bash glibc-misc python-libs python-parted python-xf86config"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
     PACKAGES="$PACKAGES pcmciautils pcmcia-cs"
@@ -1084,7 +1084,7 @@ fi
 
 echo "Running mkfontdir..."
 if [ -n "$NEEDGR" ]; then
-    mkfontdir $DESTGR/usr/share/X11/fonts/*
+    /usr/X11R6/bin/mkfontdir $DESTGR/usr/share/fonts/*
 fi
 
 echo "Creating SELinux policy..."
@@ -1099,8 +1099,6 @@ cp -r $DESTGR/etc/selinux/* $DEST/etc/selinux/
 
 echo "Getting pango modules"
 if [ -n "$NEEDGR" ]; then
-    # sick sick sick hack for pango-querymodules being -32 or -64
-    mv $DESTGR/usr/bin/pango-querymodules* $DESTGR/usr/bin/pango-querymodules
     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/pango-querymodules 2> $DESTGR/etc/pango/pango.modules"
     else
@@ -1114,7 +1112,8 @@ ModuleFiles=/etc/pango/pango.modules
 EOF
 fi
 
-host=`rpm --nodigest --nosignature -qp --qf "%{POSTIN}\n" $PACKAGEDIR/gtk2*.$ARCH.rpm |grep update-gdk-pixbuf |awk {'print $2;'}`
+host=`rpm -E %{_host}`
+
 
 case "$host" in
   *linux) canonhost="$host-gnu"
@@ -1131,7 +1130,6 @@ 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/$HOSTTRIPLET/gtk.immodules"
     else
@@ -1142,7 +1140,6 @@ fi
 
 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/$HOSTTRIPLET/gdk-pixbuf.loaders"
     else
@@ -1155,6 +1152,7 @@ rm -f $KEEPFILE $KEEPFILEGR $KEEPFILERESCUE
 
 for p in $DEST $DESTGR; do
        echo "Scrubbing trees..." "$p"
+       install -d $p/usr/bin
        cp $p/usr/lib/anaconda/raidstart-stub $p/usr/bin/raidstart
        cp $p/usr/lib/anaconda/raidstop-stub $p/usr/bin/raidstop
        cp $p/usr/lib/anaconda/losetup-stub $p/usr/bin/losetup