diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-12-07 19:57:27 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-12-07 19:57:27 +0000 |
| commit | b5325b15af9abe366b60364b712c17e48fb86be5 (patch) | |
| tree | 90470d0d194710af239ec33b62227dfe9244387f | |
| parent | 35812f1af2a244cf2cb8b9c8694837257bd69b68 (diff) | |
| download | anaconda-b5325b15af9abe366b60364b712c17e48fb86be5.tar.gz anaconda-b5325b15af9abe366b60364b712c17e48fb86be5.tar.xz anaconda-b5325b15af9abe366b60364b712c17e48fb86be5.zip | |
2006-12-07 Jeremy Katz <katzj@redhat.com>
* scripts/upd-instroot (KEEPFILE): Add etree location for celement
tree in python 2.5, drop libxml2-python since it's not used any more
* Makefile.inc (PYTHON): Be more flexible about handling of python
version
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.inc | 3 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 4 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2006-12-07 Jeremy Katz <katzj@redhat.com> + + * scripts/upd-instroot (KEEPFILE): Add etree location for celement + tree in python 2.5, drop libxml2-python since it's not used any more + + * Makefile.inc (PYTHON): Be more flexible about handling of python + version + 2006-12-05 David Cantrell <dcantrell@redhat.com> * anaconda.spec: Bump version. diff --git a/Makefile.inc b/Makefile.inc index 0675ed7d4..42982d894 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -4,7 +4,8 @@ PYTHONLIBDIR = /usr/lib/anaconda RUNTIMEDIR = /usr/lib/anaconda-runtime ANACONDADATADIR = /usr/share/anaconda -PYTHON = python2.4 +PYVER := $(shell python -c 'import sys; print sys.version[0:3]') +PYTHON = python$(PYVER) PYTHONINCLUDE = /usr/include/$(PYTHON) ARCH := $(patsubst i%86,i386,$(shell uname -m)) diff --git a/scripts/upd-instroot b/scripts/upd-instroot index c2976acba..689b9767c 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -114,7 +114,7 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage bzip2-libs dosfstools pciutils reiserfs-utils parted sed busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper - rhpl pyxf86config libxml2 libxml2-python glib2 sqlite neon + rhpl pyxf86config libxml2 glib2 sqlite neon elfutils-libelf krb5-libs convertdb1 jfsutils audit-libs pam xfsprogs xfsdump dmapi libacl libattr attr acl python-urlgrabber policy policycoreutils pyparted xorg-x11 selinux-policy-targeted @@ -410,7 +410,7 @@ usr/$LIBDIR/libz.* usr/$LIBDIR/libreadline* usr/$LIBDIR/python?.?/* usr/$LIBDIR/python?.?/email/* -usr/$LIBDIR/python?.?/site-packages/libxml2* +usr/$LIBDIR/python?.?/xml/etree/ usr/$LIBDIR/python?.?/site-packages/*kudzu* usr/$LIBDIR/python?.?/site-packages/bdevid.so usr/$LIBDIR/python?.?/site-packages/rpmmodule.so |