[PATCH] Shortened PACKAGES in upd-instroot, put font packages in FONTS

[David Cantrell <dcantrell redhat com>]

Performed 'yum --installroot=$(pwd)/tmproot install anaconda' and
removed all packages from the PACKAGES list that are pulled in by
depsolving anaconda.

Move the font packages to a separate list called FONTS.
---
 scripts/upd-instroot |   81 ++++++++++++++++---------------------------------
 1 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 64864db..8899b37 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -150,54 +150,31 @@ die () {
     exit 1
 }
 
-PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda
-    anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
-    btrfs-progs bzip2 bzip2-libs cairo cjkuni-uming-fonts
-    comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
-    cryptsetup-luks db4 dbus dbus-python dejavu-sans-fonts
-    dejavu-sans-mono-fonts device-mapper
-    device-mapper-libs dhclient dhcpv6-client dmapi dmraid dmraid-libs
-    dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme ethtool
-    elfutils-libelf expat firstboot fontconfig fonts-ISO8859-2 freetype gail gawk gdb-gdbserver
-    gdk-pixbuf gfs2-utils glib2 glibc-common gnome-python2-canvas gnome-python2-gconf
-    gnome-python2-gtkhtml2 gnome-themes gpm grep gtk2 gtk2-engines gtkhtml2 hal
-    hdparm hwdata initscripts iproute iputils iscsi-initiator-utils
-    jfsutils keyutils-libs krb5-libs libICE libSM libX11 libXau
-    libXaw libXcursor libXdmcp libXevie libXext libXfixes libXfont libXft
-    libXi libXinerama libXmu libXpm libXrandr libXrender libXt libXtst
-    libXxf86misc libacl libart_lgpl libattr libbdevid libbdevid-python
-    libbonobo libfontenc libgcc
-    libglade2 libgnomecanvas libgcrypt libgpg-error libjpeg liblbxutil libnl
-    libpixman libpng libselinux libselinux-python libsemanage
-    libsemanage-python libsepol libstdc++ libtermcap libthai libuser
-    libuser-python libvolume_id libxcb libxkbfile libxml2 lklug-fonts 
-    lohit-assamese-fonts lohit-bengali-fonts lohit-gujarati-fonts lohit-hindi-fonts
-    lohit-kashmiri-fonts lohit-kannada-fonts lohit-maithili-fonts lohit-marathi-fonts
-    lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts
-    lohit-telugu-fonts lvm2 madan-fonts mdadm
-    mesa-dri-drivers mkinitrd module-init-tools nash ncurses neon net-tools
-    newt newt-python nfs-utils nspr nss ntfs-3g pam pango parted pciutils pcre
-    policy policycoreutils popt prelink procps pycairo pygobject2 pygtk2
-    pygtk2-libglade pykickstart pyparted pyspi python python-bugzilla python-decorator
-    python-elementtree python-libs python-pyblock python-sqlite
-    python-urlgrabber pyxf86config raidtools readline redhat-artwork
-    reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted
-    setup slang smc-meera-fonts specspo sqlite synaptics system-config-date
-    system-config-keyboard ${brandpkgname}-logos ${brandpkgname}-release taipeifonts tcp_wrappers
-    tzdata udev un-core-fonts-dotum urw-fonts util-linux-ng tigervnc-server
-    tigervnc-server-module vlgothic-fonts vim-minimal
-    wpa_supplicant xkeyboard-config xfsdump xfsprogs xorg-x11 xorg-x11-auth
-    xorg-x11-base xorg-x11-drivers xorg-x11-font-utils xorg-x11-fonts-ethiopic
-    xorg-x11-fonts-misc xorg-x11-libs xorg-x11-libs-data xorg-x11-server-utils
-    xorg-x11-server-Xorg xorg-x11-xkb-utils xorg-x11-xkbdata xorg-x11-xfs yum
-    yum-fedorakmod yum-metadata-parser zenity zlib /etc/gtk-2.0/gtkrc"
+FONTS="bitmap-fonts-cjk cjkuni-uming-fonts dejavu-sans-fonts
+       dejavu-sans-mono-fonts fonts-ISO8859-2 lklug-fonts
+       lohit-assamese-fonts lohit-bengali-fonts lohit-gujarati-fonts
+       lohit-hindi-fonts lohit-kashmiri-fonts lohit-kannada-fonts
+       lohit-maithili-fonts lohit-marathi-fonts lohit-oriya-fonts
+       lohit-punjabi-fonts lohit-sindhi-fonts lohit-tamil-fonts
+       lohit-telugu-fonts madan-fonts smc-meera-fonts taipeifonts
+       un-core-fonts-dotum urw-fonts vlgothic-fonts
+       xorg-x11-fonts-ethiopic xorg-x11-fonts-misc"
+
+PACKAGES="anaconda at-spi attr btrfs-progs bzip2 dogtail echo-icon-theme
+          gail gdb-gdbserver gdk-pixbuf gfs2-utils gnome-python2-gconf
+          gnome-themes gpm gtk2-engines jfsutils libXevie libXfont
+          libbdevid libbonobo libfontenc libxkbfile neon nfs-utils ntfs-3g
+          prelink python-decorator python-sqlite redhat-artwork
+          reiserfs-utils selinux-policy-targeted specspo synaptics
+          tcp_wrappers tigervnc-server tigervnc-server-module vim-minimal
+          xkeyboard-config xfsdump xfsprogs xorg-x11-auth xorg-x11-drivers
+          xorg-x11-font-utils xorg-x11-server-Xorg xorg-x11-xkb-utils
+          xorg-x11-xfs /etc/gtk-2.0/gtkrc $FONTS"
 
 if [ $ARCH = i386 ]; then
     PACKAGES="$PACKAGES glibc.i386 openssl.i386"
 elif [ $ARCH = i586 ]; then
     PACKAGES="$PACKAGES glibc.i586 openssl.i586"
-else
-    PACKAGES="$PACKAGES glibc openssl"
 fi
 
 if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
@@ -205,7 +182,7 @@ if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
 fi
 
 if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then
-    PACKAGES="$PACKAGES dmidecode efibootmgr"
+    PACKAGES="$PACKAGES efibootmgr"
 fi
 
 if [ $ARCH = ia64 ]; then
@@ -214,10 +191,8 @@ if [ $ARCH = ia64 ]; then
 fi
 
 if [ $ARCH = s390 -o $ARCH = s390x ]; then
-    PACKAGES="$PACKAGES s390utils binutils libgcc tcp_wrappers
-              sed net-tools openssh openssh-server coreutils
-              login initscripts portmap pam
-              login mount modutils s390utils-cmsfs
+    PACKAGES="$PACKAGES s390utils binutils tcp_wrappers
+              openssh openssh-server login portmap
               strace xorg-x11-xauth xorg-x11-libs"
 fi
 
@@ -230,12 +205,10 @@ fi
 #
 # these packages are combined with the PACKAGES for big stage 2
 #
-PACKAGESRESCUE="bzip2 bzip2-libs dump libidn
-                findutils ftp gzip iputils joe krb5-libs less man
-                modutils mtools mt-st mtr net-tools open smartmontools
-                openssh openssh-clients pciutils rsh traceroute tar rsync
-                device-mapper device-mapper-libs dmraid ntfsprogs samba-client
-		firstaidkit firstaidkit-plugin-all dialog"
+PACKAGESRESCUE="bzip2 dump ftp joe man mt-st mtr smartmontools
+                openssh openssh-clients rsh traceroute rsync
+                ntfsprogs samba-client dialog
+                firstaidkit firstaidkit-plugin-all"
 
 if [ $ARCH = i386 -o $ARCH = i586 -o $ARCH = x86_64 ]; then
     PACKAGESRESCUE="$PACKAGESRESCUE gpart grub"
-- 
1.6.2.5