rpms/anaconda
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Wed Sep 19 2007 Jeremy Katz <katzj@redhat.com> 11.3.0.32-1

Browse Source 
- spec file cleanups (dcantrell)
- lots of pychecker fixes (clumens)
- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
- Fix upgrade traceback (clumens, #296571)
- Few live install fixes
This commit is contained in:
Jeremy Katz 2007-09-20 03:15:09 +00:00
parent 709976ab44
commit bae82e7f18
3 changed files with 117 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,3 +1 @@
anaconda-11.3.0.28.tar.bz2 anaconda-11.3.0.32.tar.bz2
anaconda-11.3.0.29.tar.bz2
anaconda-11.3.0.31.tar.bz2

166
anaconda.spec
View File

@ -1,69 +1,124 @@
%define livearches %{ix86} x86_64 %define livearches %{ix86} x86_64
Name: anaconda
Version: 11.3.0.31
Release: 1
License: GPL
Summary: Graphical system installer Summary: Graphical system installer
Group: Applications/System Name: anaconda
Source: anaconda-%{version}.tar.bz2 Version: 11.3.0.32
BuildRequires: kudzu-devel >= 1.2.68, pciutils-devel Release: 1
BuildRequires: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel License: GPLv2
BuildRequires: rpm-python >= 4.2-0.61, rpm-devel, gettext >= 0.11 Group: Applications/System
BuildRequires: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel URL: http://fedoraproject.org/wiki/Anaconda
BuildRequires: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
BuildRequires: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber Source0: anaconda-%{version}.tar.bz2
BuildRequires: pykickstart >= 0.96, yum >= 2.9.2,
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
%define dmver 1.02.17-6 %define dmver 1.02.17-6
BuildRequires: device-mapper-devel >= %{dmver} %define gettextver 0.11
BuildRequires: libsepol-devel %define glib2ver 2.11.1-5
BuildRequires: pango-devel, pirut, libXt-devel %define intltoolver 0.31.2-3
BuildRequires: slang-devel >= 2.0.6-2, slang-static %define kudzuver 1.2.68
BuildRequires: newt-devel, newt-static %define libdhcpver 1.27-3
BuildRequires: glib2-devel >= 2.11.1-5, glib2-static, libdhcp6client-static %define libselinuxver 1.6
BuildRequires: libdhcp-static >= 1.24-3, mkinitrd-devel >= 5.1.2-1 %define mkinitrdver 5.1.2-1
%define pykickstartver 0.96
%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 pirutver 1.1.0
%define syscfgdatever 1.9.0
%define pythonpyblockver 0.24-1
%define libbdevidver 5.1.2-1
%define rhpxlver 0.25
%define desktopfileutilsver 0.8
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
BuildRequires: popt-devel, popt-static BuildRequires: beecrypt-devel
BuildRequires: booty
BuildRequires: bzip2-devel
BuildRequires: device-mapper-devel >= %{dmver}
BuildRequires: e2fsprogs-devel
BuildRequires: elfutils-devel
BuildRequires: gettext >= %{gettextver}
BuildRequires: glib2-static >= %{glib2ver}
BuildRequires: gtk2-devel
BuildRequires: intltool >= %{intltoolver}
BuildRequires: kudzu-devel >= %{kudzuver}
BuildRequires: libX11-devel
BuildRequires: libXt-devel
BuildRequires: libXxf86misc-devel
BuildRequires: libdhcp-static >= %{libdhcpver}
BuildRequires: libselinux-devel >= %{libselinuxver}
BuildRequires: libsepol-devel
BuildRequires: libxml2-python
BuildRequires: mkinitrd-devel >= %{mkinitrdver}
BuildRequires: newt-static
BuildRequires: pango-devel
BuildRequires: pciutils-devel
BuildRequires: pirut
BuildRequires: popt-static
BuildRequires: pykickstart >= %{pykickstartver}
BuildRequires: python-devel
BuildRequires: python-urlgrabber
BuildRequires: rhpl
BuildRequires: rpm-devel
BuildRequires: rpm-python >= %{rpmpythonver}
BuildRequires: slang-static >= %{slangver}
BuildRequires: yum >= %{yumver}
BuildRequires: zlib-devel
%ifarch %livearches %ifarch %livearches
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
%endif %endif
Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, booty
Requires: parted >= 1.8.1, pyparted >= 1.8.1 Requires: rpm-python >= %{rpmpythonver}
Requires: kudzu >= 1.2.68, yum >= 2.9.2, pirut >= 1.1.0 Requires: rhpl >= %{rhplver}
Requires: libxml2-python, python-urlgrabber Requires: booty
Requires: system-logos, pykickstart >= 0.96, system-config-date >= 1.9.0 Requires: parted >= %{partedver}
Requires: device-mapper >= %{dmver}, device-mapper-libs >= %{dmver} Requires: pyparted >= %{partedver}
Requires: dosfstools e2fsprogs Requires: kudzu >= %{kudzuver}
Requires: python-pyblock >= 0.24-1 Requires: yum >= %{yumver}
Requires: libbdevid >= 5.1.2-1, libbdevid-python Requires: pirut >= %{pirutver}
Requires: libxml2-python
Requires: python-urlgrabber
Requires: system-logos
Requires: pykickstart >= %{pykickstartver}
Requires: system-config-date >= %{syscfgdatever}
Requires: device-mapper >= %{dmver}
Requires: device-mapper-libs >= %{dmver}
Requires: dosfstools
Requires: e2fsprogs
Requires: python-pyblock >= %{pythonpyblockver}
Requires: libbdevid >= %{libbdevidver}
Requires: libbdevid-python
Requires: audit-libs Requires: audit-libs
Requires: libuser-python, newt-python Requires: libuser-python
Requires: newt-python
Requires: authconfig Requires: authconfig
Requires: gnome-python2-gtkhtml2 Requires: gnome-python2-gtkhtml2
Requires: system-config-securitylevel Requires: system-config-securitylevel
%ifnarch s390 s390x ppc64 %ifnarch s390 s390x ppc64
Requires: rhpxl >= 0.25 Requires: rhpxl >= %{rhpxlver}
Requires: system-config-keyboard Requires: system-config-keyboard
%endif %endif
%ifarch %livearches %ifarch %livearches
Requires: usermode Requires: usermode
Requires: zenity Requires: zenity
Requires(post): desktop-file-utils >= 0.8 Requires(post): desktop-file-utils >= %{desktopfileutilsver}
Requires(postun): desktop-file-utils >= 0.8 Requires(postun): desktop-file-utils >= %{desktopfileutilsver}
%endif %endif
Obsoletes: anaconda-images <= 10 Obsoletes: anaconda-images <= 10
Url: http://fedoraproject.org/wiki/Anaconda
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
The anaconda package contains the program which was used to install your The anaconda package contains the program which was used to install your
system. These files are of little use on an already installed system. system. These files are of little use on an already installed system.
%package runtime %package runtime
Summary: Graphical system installer portions needed only for fresh installs. Summary: Graphical system installer portions needed only for fresh installs
Group: Applications/System Group: Applications/System
Requires: libxml2-python, python, rpm-python >= 4.2-0.61 Requires: libxml2-python, python, rpm-python >= %{rpmpythonver}
Requires: anaconda = %{version}-%{release} Requires: anaconda = %{version}-%{release}
Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs Requires: createrepo >= 0.4.7, squashfs-tools, mkisofs
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
@ -93,21 +148,21 @@ an md5sum implanted into an ISO9660 image.
%setup -q %setup -q
%build %build
make depend %{__make} depend
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT %{__rm} -rf %{buildroot}
make DESTDIR=$RPM_BUILD_ROOT install %{__make} install DESTDIR=%{buildroot}
%ifarch %livearches %ifarch %livearches
desktop-file-install --vendor="" --dir=$RPM_BUILD_ROOT/%{_datadir}/applications $RPM_BUILD_ROOT/%{_datadir}/applications/liveinst.desktop desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop
%endif %endif
%find_lang %{name} %find_lang %{name}
%clean %clean
rm -rf $RPM_BUILD_ROOT %{__rm} -rf %{buildroot}
%ifarch %livearches %ifarch %livearches
%post %post
@ -128,13 +183,13 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/kickstart-docs.txt %doc docs/kickstart-docs.txt
%doc docs/mediacheck.txt %doc docs/mediacheck.txt
%doc docs/anaconda-release-notes.txt %doc docs/anaconda-release-notes.txt
/usr/bin/mini-wm %{_bindir}/mini-wm
/usr/sbin/anaconda %{_sbindir}/anaconda
%ifarch i386 x86_64 %ifarch i386 x86_64
/usr/sbin/gptsync %{_sbindir}/gptsync
%endif %endif
/usr/share/anaconda %{_datadir}/anaconda
/usr/lib/anaconda %{_prefix}/lib/anaconda
%ifarch %livearches %ifarch %livearches
%{_bindir}/liveinst %{_bindir}/liveinst
%{_sbindir}/liveinst %{_sbindir}/liveinst
@ -146,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT
%files runtime %files runtime
%defattr(-,root,root) %defattr(-,root,root)
/usr/lib/anaconda-runtime %{_prefix}/lib/anaconda-runtime
%files -n isomd5sum %files -n isomd5sum
%defattr(-,root,root) %defattr(-,root,root)
@ -158,6 +213,13 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || : /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog %changelog
* Wed Sep 19 2007 Jeremy Katz <katzj@redhat.com> 11.3.0.32-1
- spec file cleanups (dcantrell)
- lots of pychecker fixes (clumens)
- revert writing out anaconda-ks.cfg earlier; breaks live installs (clumens)
- Fix upgrade traceback (clumens, #296571)
- Few live install fixes
* Tue Sep 18 2007 Chris Lumens <clumens@redhat.com> 11.3.0.31-1 * Tue Sep 18 2007 Chris Lumens <clumens@redhat.com> 11.3.0.31-1
- Really include new Japanese font (katzj, #279931). - Really include new Japanese font (katzj, #279931).
- Use /dev/live-osimg-min if it exists (katzj). - Use /dev/live-osimg-min if it exists (katzj).

2
sources
View File

@ -1 +1 @@
9786fb11aba1ac3d387490e1fcb2ba2c anaconda-11.3.0.31.tar.bz2 4bd27095e1ac6fe29efa20ab7b9a20f2 anaconda-11.3.0.32.tar.bz2