summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-11-17 23:58:31 +0000
committerJeremy Katz <katzj@redhat.com>2005-11-17 23:58:31 +0000
commit669ecddfb5a4ff1e2d06ce2297e94536a6155cfe (patch)
treeb8000fd05f51d0c4e3ccefb6125f08f8d31b9e89
parent6b80a438125571b14ff7227d55175081564eb606 (diff)
downloadanaconda-669ecddfb5a4ff1e2d06ce2297e94536a6155cfe.tar.gz
anaconda-669ecddfb5a4ff1e2d06ce2297e94536a6155cfe.tar.xz
anaconda-669ecddfb5a4ff1e2d06ce2297e94536a6155cfe.zip
2005-11-17 Jeremy Katz <katzj@redhat.com>
* scripts/upd-instroot: vnc hack me harder...
-rw-r--r--ChangeLog10
-rwxr-xr-xscripts/upd-instroot3
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 156f91a6c..b77d4ebca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+2005-11-17 Jeremy Katz <katzj@redhat.com>
+
+ * scripts/upd-instroot: vnc hack me harder...
+
+ * yuminstall.py (YumSorter.tsCheck): Don't traceback on
+ unresolvable deps.
+ (AnacondaYum.getBestPackages): Fix pkg.arch for %packages
+
2005-11-17 Paul Nasrat <pnasrat@redhat.com>
* anaconda.spec: Bump version.
* scripts/buildinstall: Groups for createrepo
-2005-11-17 Jeremy Katz <katzj@redhat.com>
+2005-11-17 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 8aa670378..e31365473 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -982,8 +982,9 @@ rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/librecord.a
rm -f $DESTGR/usr/X11R6/$LIBDIR/modules/extensions/lib{GLcore,glx,pex5}*
# FIXME: hack for Xvnc's wrong font path
-mkdir -p $DESTGR/usr/X11R6/$LIBDIR/X11
+mkdir -p $DESTGR/usr/X11R6/$LIBDIR/X11 $DESTGR/usr/X11R7/$LIBDIR/X11
ln -s ../../../share/X11/fonts $DESTGR/usr/X11R6/$LIBDIR/X11/fonts
+ln -s ../../../share/X11/fonts $DESTGR/usr/X11R7/$LIBDIR/X11/fonts
# fixup joe links
ln -fs jpicorc $DESTGR/etc/joe/picorc