diff options
| author | Jeremy Katz <katzj@redhat.com> | 2009-07-27 09:12:13 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2009-07-29 15:21:16 -0400 |
| commit | 58abb414dcd34f13106a4302a884eb3f10a1ad06 (patch) | |
| tree | d1f970a3741d59bbe91944da86f30b383a07014b | |
| parent | c967ded36ace32f6764f7650bb8f1a8f42c78b05 (diff) | |
| download | anaconda-58abb414dcd34f13106a4302a884eb3f10a1ad06.tar.gz anaconda-58abb414dcd34f13106a4302a884eb3f10a1ad06.tar.xz anaconda-58abb414dcd34f13106a4302a884eb3f10a1ad06.zip | |
And finish off the removal of rhpl
Finish off removing the symlinking and requirements for rhpl in
anaconda.
| -rwxr-xr-x | anaconda | 2 | ||||
| -rw-r--r-- | anaconda.spec.in | 3 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 3 | ||||
| -rw-r--r-- | yuminstall.py | 3 |
4 files changed, 3 insertions, 8 deletions
@@ -139,7 +139,7 @@ def setupPythonUpdates(): except: pass - for pypkg in ("block", "rhpl", "yum", "rpmUtils", "urlgrabber", "pykickstart", "parted", "meh"): + for pypkg in ("block", "yum", "rpmUtils", "urlgrabber", "pykickstart", "parted", "meh"): # get the libdir. *sigh* if os.access("/usr/lib64/python%s/site-packages/%s" %(pyver, pypkg), os.X_OK): diff --git a/anaconda.spec.in b/anaconda.spec.in index 4f380a44a..ee6d7c52d 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -30,7 +30,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define rpmpythonver 4.2-0.61 %define slangver 2.0.6-2 %define yumver 2.9.2 -%define rhplver 0.170 %define partedver 1.8.1 %define pypartedver 2.0.0 %define syscfgdatever 1.9.0 @@ -67,7 +66,6 @@ BuildRequires: popt-devel BuildRequires: pykickstart >= %{pykickstartver} BuildRequires: python-devel BuildRequires: python-urlgrabber -BuildRequires: rhpl BuildRequires: rpm-python >= %{rpmpythonver} BuildRequires: slang-devel >= %{slangver} BuildRequires: xmlto @@ -84,7 +82,6 @@ BuildRequires: iscsi-initiator-utils-devel >= %{iscsiver} Requires: policycoreutils Requires: rpm-python >= %{rpmpythonver} Requires: comps-extras -Requires: rhpl >= %{rhplver} Requires: parted >= %{partedver} Requires: pyparted >= %{pypartedver} Requires: yum >= %{yumver} diff --git a/scripts/upd-instroot b/scripts/upd-instroot index e1750349a..80b69f01d 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -181,7 +181,7 @@ PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit acl anaconda pygtk2-libglade pykickstart pyparted python python-bugzilla python-decorator python-libs python-pyblock python-sqlite python-urlgrabber pyxf86config readline redhat-artwork - reiserfs-utils rhpl rpm rpm-libs rpm-python sed selinux-policy-targeted + reiserfs-utils 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 @@ -612,7 +612,6 @@ usr/share/locale/*/LC_MESSAGES/gtk20.mo usr/share/locale/*/LC_MESSAGES/libc.mo usr/share/locale/*/LC_MESSAGES/parted.mo usr/share/locale/*/LC_MESSAGES/redhat-dist.mo -usr/share/locale/*/LC_MESSAGES/rhpl.mo usr/share/locale/*/LC_MESSAGES/system-config-date.mo usr/share/locale/*/LC_MESSAGES/system-config-keyboard.mo usr/share/locale/*/LC_MESSAGES/zenity.mo diff --git a/yuminstall.py b/yuminstall.py index 687646340..a087cbc2b 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1270,8 +1270,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon # installed (they could have been removed in kickstart). So we'll force # it. def selectAnacondaNeeds(self): - for pkg in ['authconfig', 'chkconfig', 'mkinitrd', 'rhpl', - 'system-config-firewall-tui']: + for pkg in ['authconfig', 'chkconfig', 'mkinitrd', 'system-config-firewall-tui']: self.selectPackage(pkg) def doPostSelection(self, anaconda): |