- update booty dep

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index e62c8703c8c882342bf86bd5588eaf22e64b4025..44c962f95282d73e1b4e4a41b4f7aef8b88508e9 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -14,7 +14,7 @@ Summary:      Graphical system installer
 Summary(pl):   Graficzny instalator systemu
 Name:          anaconda
 Version:       11.0.5
-Release:       0.14
+Release:       0.24
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
@@ -28,6 +28,8 @@ Patch1:               %{name}-BUS_XEN.patch
 Patch2:                %{name}-vserver-proc.patch
 Patch3:                %{name}-pkgorder.patch
 Patch4:                %{name}-errorhandling.patch
+Patch5:                %{name}-libdir.patch
+Patch6:                %{name}-pld-release.patch
 URL:           http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires: X11-devel
 BuildRequires: beecrypt-devel
@@ -52,8 +54,9 @@ BuildRequires:        pango-devel
 BuildRequires: pciutils-devel
 BuildRequires: pirut
 BuildRequires: popt-static
-BuildRequires: pump-devel >= 0.8.20
-BuildRequires: python-booty
+BuildRequires: pump-devel >= 0.8.24-1
+BuildRequires: pump-static >= 0.8.24-1
+BuildRequires: python-booty >= 0.71
 BuildRequires: python-devel
 BuildRequires: python-kickstart
 BuildRequires: python-libxml2
@@ -62,17 +65,18 @@ BuildRequires:      python-rpm >= 4.2-0.61
 BuildRequires: python-urlgrabber
 BuildRequires: rpm-devel
 BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.234
 BuildRequires: sed >= 4.0
 BuildRequires: slang-static
 BuildRequires: yum
 BuildRequires: zlib-devel
 BuildRequires: zlib-static
-Requires:      anaconda-help
 Requires:      device-mapper >= 1.01.05
 Requires:      kudzu > 1.2.0
 Requires:      parted >= 1.6.3-7
 Requires:      pirut
-Requires:      python-booty
+Requires:      python-booty >= 0.71
+Requires:      python-devel-tools
 Requires:      python-kickstart
 Requires:      python-libxml2
 Requires:      python-parted
@@ -138,6 +142,8 @@ systemach.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
@@ -156,29 +162,30 @@ fi
 %{__make} \
        RPM_OPT_FLAGS="%{rpmcflags}"
 
+./py-compile isys/isys.py
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install isys/isys.py[co] $RPM_BUILD_ROOT%{_libdir}/anaconda
+
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/upd-instroot
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images.i386
 cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/scrubtree
 
 %find_lang %{name}
+%py_postclean %{_libdir}/anaconda
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/command-line.txt
-%doc docs/install-methods.txt
-%doc docs/kickstart-docs.txt
-%doc docs/mediacheck.txt
-%doc docs/anaconda-release-notes.txt
+%doc docs/*
 %attr(755,root,root) %{_bindir}/mini-wm
 %attr(755,root,root) %{_sbindir}/anaconda
 %{_datadir}/anaconda
@@ -200,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5
-%{_libdir}/anaconda-runtime/keymaps-override-i386
+%{_libdir}/anaconda-runtime/keymaps-override-*
 %attr(755,root,root) %{_libdir}/anaconda-runtime/libunicode-lite.so.1
 %dir %attr(755,root,root) %{_libdir}/anaconda-runtime/loader
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init
@@ -227,7 +234,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/pythondeps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/readmap
 %attr(755,root,root) %{_libdir}/anaconda-runtime/scrubtree
-%{_libdir}/anaconda-runtime/screenfont-i386.gz
+%{_libdir}/anaconda-runtime/screenfont-*.gz
 %attr(755,root,root) %{_libdir}/anaconda-runtime/splittree.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/trimmodalias
 %attr(755,root,root) %{_libdir}/anaconda-runtime/trimpciids