diff --git a/.cvsignore b/.cvsignore index 0a4bf4a..b51cc4c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,7 +1 @@ -anaconda-11.4.1.1.tar.bz2 -anaconda-11.4.1.2.tar.bz2 -anaconda-11.4.1.3.tar.bz2 -anaconda-11.4.1.4.tar.bz2 -anaconda-11.4.1.5.tar.bz2 -anaconda-11.4.1.6.tar.bz2 -anaconda-11.4.1.7.tar.bz2 +anaconda-11.4.1.8.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 96b3ce0..df1964c 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -2,7 +2,7 @@ Summary: Graphical system installer Name: anaconda -Version: 11.4.1.7 +Version: 11.4.1.8 Release: 1 License: GPLv2+ Group: Applications/System @@ -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,14 +190,21 @@ 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 || : %changelog +* Mon Jun 23 2008 Jeremy Katz - 11.4.1.8-1 +- Remove from being installed too (katzj) +- Remove anaconda-runtime as a separate subpackage (katzj) +- Remove the stuff we're not calling. (pjones) +- Remove this since we don't use it anymore (katzj) +- Don't continue on using the base installclass if we can't find one (katzj) +- Get rid of wlite and unicode-lite; these were necessary to support (pjones) +- Remove pkgorder and splittree; these should be in pungi (katzj) +- Add the .treeinfo file into the exception report. (clumens) +- Fix a typo (#452140). (clumens) + * Fri Jun 20 2008 Chris Lumens - 11.4.1.7-1 - Remove ancient block of code to upgrade Netscape Communicator. (clumens) - Move enableNetwork into the interface. Bring network up for scp. (clumens) diff --git a/sources b/sources index ce42517..15d7068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -649e2a1159e2726f33f56eb0a77a5c64 anaconda-11.4.1.7.tar.bz2 +96df3eebbe6c6f5d7a9e62a3f2118166 anaconda-11.4.1.8.tar.bz2