- try to be nice to the network config

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index db59cdb4d8d8c6f1915f1ef13780dccf4f25cdaa..19a43dd7c1b963740e6ed94f8895c64e6286872a 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,31 +1,29 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
-# - pldize /etc/fstab
-# - /etc/modprobe.conf for geninitrd
 #
-%define                rel     200808292136
+%define                rel     200809012206
 Summary:       Graphical system installer
 Summary(pl.UTF-8):     Graficzny instalator systemu
 Name:          anaconda
 Version:       11.4.1.%{rel}
-Release:       3
+Release:       1
 License:       GPL
 Group:         Applications/System
 # http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch
 Source0:       %{name}-%{rel}.tar.bz2
-# Source0-md5: 1a3e6c15b9080fef45b53c2a471383ce
+# Source0-md5: 3d95f45c92662958a1e91af7c77b19ea
 URL:           http://fedoraproject.org/wiki/Anaconda
+BuildRequires: NetworkManager-devel
+BuildRequires: audit-libs-devel
 # will kill it in the future
 BuildRequires: curl
-BuildRequires: device-mapper-static >= 1.01.05
+BuildRequires: device-mapper-devel >= 1.01.05
 BuildRequires: e2fsprogs-devel
 BuildRequires: gettext-devel >= 0.11
-BuildRequires: glib2-static
-BuildRequires: glibc-static
+BuildRequires: glib2-devel
 BuildRequires: gtk+2-devel
 BuildRequires: isomd5sum-devel
 BuildRequires: libdhcp-devel
-BuildRequires: libdhcp-static
 BuildRequires: libdhcp4client-devel
 BuildRequires: libdhcp6client-devel
 BuildRequires: libnl-devel
@@ -40,9 +38,10 @@ BuildRequires:       python-rpm
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.234
 BuildRequires: sed >= 4.0
-BuildRequires: slang-static
-BuildRequires: zlib-static
+BuildRequires: slang-devel
+BuildRequires: zlib-devel
 Requires:      /etc/pld-release
+Requires:      NetworkManager
 Requires:      bdevid
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
@@ -53,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
@@ -73,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
@@ -120,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
@@ -175,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}
@@ -197,11 +197,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/keymaps.gz
 /etc/security/console.apps/liveinst
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/liveinst
-%attr(755,root,root) %{_bindir}/liveinst
 %attr(755,root,root) %{_sbindir}/anaconda
-%attr(755,root,root) %{_sbindir}/gptsync
 %attr(755,root,root) %{_sbindir}/liveinst
+%ifnarch ppc
+%attr(755,root,root) %{_sbindir}/gptsync
 %attr(755,root,root) %{_sbindir}/showpart
+%endif
 %dir %{_libdir}/anaconda
 %{_libdir}/anaconda/*.py[co]
 %dir %{_libdir}/anaconda/installclasses
@@ -235,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda/*-stub
 %dir %{_libdir}/anaconda-runtime
 %dir %{_libdir}/anaconda-runtime/boot
+%ifnarch ppc
 %{_libdir}/anaconda-runtime/boot/boot.msg
 %{_libdir}/anaconda-runtime/boot/general.msg
 %{_libdir}/anaconda-runtime/boot/grub.conf
@@ -242,6 +244,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/anaconda-runtime/boot/param.msg
 %{_libdir}/anaconda-runtime/boot/rescue.msg
 %{_libdir}/anaconda-runtime/boot/syslinux.cfg
+%else
+%{_libdir}/anaconda-runtime/boot/bootinfo.txt
+%{_libdir}/anaconda-runtime/boot/magic
+%{_libdir}/anaconda-runtime/boot/mapping
+%{_libdir}/anaconda-runtime/boot/ofboot.b
+%{_libdir}/anaconda-runtime/boot/yaboot.conf.3264
+%{_libdir}/anaconda-runtime/boot/yaboot.conf.in
+%endif
 %attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall
 %attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall.functions
 %attr(755,root,root) %{_libdir}/anaconda-runtime/genmodinfo