- try to be nice to the network config

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index d5135fbaa0c16176471ae76b1748d47a0a1faac5..19a43dd7c1b963740e6ed94f8895c64e6286872a 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,9 +1,7 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
-# - pldize /etc/fstab
-# - /etc/modprobe.conf for geninitrd
 #
-%define                rel     200808302106
+%define                rel     200809012206
 Summary:       Graphical system installer
 Summary(pl.UTF-8):     Graficzny instalator systemu
 Name:          anaconda
@@ -13,8 +11,9 @@ License:      GPL
 Group:         Applications/System
 # http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch
 Source0:       %{name}-%{rel}.tar.bz2
-# Source0-md5: fb7e79ba95ea2f05866808a521a0f674
+# Source0-md5: 3d95f45c92662958a1e91af7c77b19ea
 URL:           http://fedoraproject.org/wiki/Anaconda
+BuildRequires: NetworkManager-devel
 BuildRequires: audit-libs-devel
 # will kill it in the future
 BuildRequires: curl
@@ -42,6 +41,7 @@ BuildRequires:        sed >= 4.0
 BuildRequires: slang-devel
 BuildRequires: zlib-devel
 Requires:      /etc/pld-release
+Requires:      NetworkManager
 Requires:      bdevid
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
@@ -52,8 +52,9 @@ Requires:     hfsutils
 Requires:      jfsutils
 Requires:      lvm2
 Requires:      mdadm
+Requires:      pci-database
 Requires:      python-bdevid >= 6.0.24
-Requires:      python-booty >= 0.93
+Requires:      python-booty >= 0.93-4
 Requires:      python-cracklib
 Requires:      python-dbus
 Requires:      python-devel-tools
@@ -72,7 +73,7 @@ Requires:     system-config-date >= 1.9.17
 Requires:      tzdata
 Requires:      util-linux
 Requires:      xfsprogs
-Requires:      yum >= 2.5.1-3
+Requires:      yum >= 3.2.19
 %ifnarch s390 s390x
 Requires:      python-pyblock >= 0.7-1
 %endif
@@ -119,7 +120,7 @@ Requires:   python
 Requires:      python-libxml2
 Requires:      python-rpm >= 4.2-0.61
 Requires:      squashfs
-Requires:      yum >= 2.4.0
+Requires:      yum >= 3.2.19
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system
@@ -174,13 +175,13 @@ install isys/isys.py[co] $RPM_BUILD_ROOT%{_libdir}/anaconda
 
 # for ./isys/lang.c:isysLoadKeymap()
 %ifarch %{ix86}
-cp -a loader2/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 %ifarch ppc
-cp -a loader2/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 %ifarch %{x8664}
-cp -a loader2/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 
 %find_lang %{name}