[PATCH rhel 5.4, take II] Fix specification of zoneinfo files to be included in stage2 (#481617).

[Radek Vykydal <rvykydal redhat com>]

Unlike in Fedora, whole directory subtrees must be specified using '*'.
Also remove use of variable removed in original patch for the bug.
---
 scripts/upd-instroot |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 5948de4..f29fe17 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -518,7 +518,7 @@ usr/share/hwdata/videodrivers
 usr/share/hwdata/MonitorsDB
 usr/share/xorg/extramodes
 usr/share/xorg/vesamodes
-usr/share/zoneinfo/zone.tab
+usr/share/zoneinfo/*
 EOF
 
 if [ $ARCH = s390 -o $ARCH = s390x ]; then
@@ -836,7 +836,7 @@ usr/share/terminfo/v/vt320-w
 usr/share/themes/Clearlooks/gtk-2.0/*
 usr/share/themes/Clearlooks/index.theme
 usr/share/vte/termcap/xterm
-usr/share/zoneinfo
+usr/share/zoneinfo/*
 EOF
 
 # more dogtail stuff...
@@ -1332,9 +1332,6 @@ rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/email/test/
 rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/curses/
 rm -rf $DESTGR/usr/$LIBDIR/python?.?/site-packages/pydoc.py
 
-# clean up tzdata
-rm -rf $TZDIR
-
 # this is only for the minimal second stage
 echo "Cleaning ramdisk install images..."
 rm -rf $DEST/usr/lib/anaconda-runtime
-- 
1.5.4.3