diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-06-23 17:36:15 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-06-23 17:40:05 -0400 |
| commit | 48fb733caea4a7a931a64c2095d05a69ce10e455 (patch) | |
| tree | 515c744188b3a9605b0fd99ffffb0be4790a6c65 /anaconda.spec | |
| parent | 08a261a30351e8fd7f1df4a974576b737ce8899b (diff) | |
| download | anaconda-48fb733caea4a7a931a64c2095d05a69ce10e455.tar.gz anaconda-48fb733caea4a7a931a64c2095d05a69ce10e455.tar.xz anaconda-48fb733caea4a7a931a64c2095d05a69ce10e455.zip | |
Remove anaconda-runtime as a separate subpackage
Diffstat (limited to 'anaconda.spec')
| -rw-r--r-- | anaconda.spec | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/anaconda.spec b/anaconda.spec index 96b3ce02d..d7169eacb 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -113,17 +113,6 @@ Requires: zenity Requires(post): desktop-file-utils >= %{desktopfileutilsver} Requires(postun): desktop-file-utils >= %{desktopfileutilsver} %endif -Obsoletes: anaconda-images <= 10 - -%description -The anaconda package contains the program which was used to install your -system. These files are of little use on an already installed system. - -%package runtime -Summary: Graphical system installer portions needed only for fresh installs -Group: Applications/System -Requires: libxml2-python, python, rpm-python >= %{rpmpythonver} -Requires: anaconda = %{version}-%{release} Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs %ifarch %{ix86} x86_64 Requires: syslinux @@ -133,16 +122,16 @@ Requires: device-mapper %ifarch s390 s390x Requires: openssh %endif -Requires: xorg-x11-font-utils, netpbm-progs Requires: busybox-anaconda Requires: isomd5sum Requires: yum-utils >= 1.1.11-3 -Requires: util-linux +Obsoletes: anaconda-images <= 10 +Obsoletes: anaconda-runtime < %{version}-%{release} +Provides: anaconda-runtime = %{version}-%{release} -%description runtime -The anaconda-runtime package contains parts of the installation system which -are needed for installing new systems. These files are used to build media -sets, but are not meant for use on already installed systems. +%description +The anaconda package contains the program which was used to install your +system. These files are of little use on an already installed system. %prep %setup -q @@ -191,6 +180,7 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu %endif %{_datadir}/anaconda %{_prefix}/lib/anaconda +%{_prefix}/lib/anaconda-runtime %ifarch %livearches %{_bindir}/liveinst %{_sbindir}/liveinst @@ -200,10 +190,6 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu %{_datadir}/applications/*.desktop %endif -%files runtime -%defattr(-,root,root) -%{_prefix}/lib/anaconda-runtime - %triggerun -- anaconda < 8.0-1 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : |