summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2006-07-26 17:55:42 +0000
committerPeter Jones <pjones@redhat.com>2006-07-26 17:55:42 +0000
commit6de57d0bfd4e295e833b4d06ce75b463b2c0b5ab (patch)
tree6a67321d39059a6c68df6f19c80ba23686ca1017
parent8763fb4f8cbccc6317ca0aff0f0dcbab18aacee2 (diff)
downloadanaconda-6de57d0bfd4e295e833b4d06ce75b463b2c0b5ab.tar.gz
anaconda-6de57d0bfd4e295e833b4d06ce75b463b2c0b5ab.tar.xz
anaconda-6de57d0bfd4e295e833b4d06ce75b463b2c0b5ab.zip
- require libbdevid-python
-rw-r--r--ChangeLog3
-rw-r--r--anaconda.spec3
-rwxr-xr-xscripts/upd-instroot4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b569933c3..5af244e77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
* upgrade.py: ditto
+ * scripts/upd-instroot: require libbdevid-python whereever we require
+ libbdevid.
+
2006-07-26 Jeremy Katz <katzj@redhat.com>
* lang-table: Add Kannada
diff --git a/anaconda.spec b/anaconda.spec
index 57837856e..3aaa6a0c9 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -24,7 +24,8 @@ Requires: system-logos, pykickstart, system-config-date
Requires: device-mapper >= 1.01.05-3
Requires: dosfstools e2fsprogs
%ifnarch s390 s390x
-Requires: python-pyblock >= 0.17-1, libbdevid >= 5.1.0-1
+Requires: python-pyblock >= 0.17-1
+Requires: libbdevid >= 5.1.2-1, libbdevid-python
%endif
%ifnarch s390 s390x ppc64
Requires: rhpxl
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index ae441f7af..33f7edf89 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -136,7 +136,7 @@ if [ $ARCH = s390 -o $ARCH = s390x ]; then
fi
if [ $ARCH != s390 -a $ARCH != s390x ]; then
- PACKAGES="$PACKAGES python-pyblock libbdevid"
+ PACKAGES="$PACKAGES python-pyblock libbdevid libbdevid-python"
fi
if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
@@ -239,7 +239,7 @@ PACKAGESGR="$PACKAGESGR gail at-spi libbonobo ORBit2"
# dmraid stuff
if [ $ARCH != s390 -a $ARCH != s390x ]; then
- PACKAGESGR="$PACKAGESGR python-pyblock libbdevid"
+ PACKAGESGR="$PACKAGESGR python-pyblock libbdevid libbdevid-python"
fi
# modular xorg...