- updated mkfontdir package name (bleh, /packages is inconvenient to do such commits :/)

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index db59cdb4d8d8c6f1915f1ef13780dccf4f25cdaa..6dd9d77fd83e632995dc3763f38e47c644308ff1 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,31 +1,30 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
-# - pldize /etc/fstab
-# - /etc/modprobe.conf for geninitrd
 #
-%define                rel     200808292136
+%define                rel     200903212129
 Summary:       Graphical system installer
 Summary(pl.UTF-8):     Graficzny instalator systemu
 Name:          anaconda
-Version:       11.4.1.%{rel}
+Version:       11.5.0.23.%{rel}
 Release:       3
 License:       GPL
 Group:         Applications/System
-# http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch
+# http://team.pld-linux.org/~patrys/anaconda.git
 Source0:       %{name}-%{rel}.tar.bz2
-# Source0-md5: 1a3e6c15b9080fef45b53c2a471383ce
+# Source0-md5: fb56c92d2c83f5a356891b2b13c7fc7b
 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: dbus-devel
+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
@@ -34,16 +33,18 @@ BuildRequires:      libsepol-devel
 BuildRequires: newt-devel
 BuildRequires: popt-devel
 BuildRequires: python-devel
-BuildRequires: python-kickstart >= 1.42
+BuildRequires: python-kickstart >= 1.50
 BuildRequires: python-rhpl
 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:      cryptsetup-luks
 Requires:      device-mapper >= 1.01.05
 Requires:      dosfstools
 Requires:      e2fsprogs
@@ -53,16 +54,18 @@ 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
 Requires:      python-iniparse
-Requires:      python-kickstart >= 1.42
+Requires:      python-kickstart >= 1.44
 Requires:      python-libuser
 Requires:      python-libxml2
-Requires:      python-parted >= 1.8.9
+Requires:      python-parted >= 2.0.8
+Requires:      python-pyblock >= 0.32
 Requires:      python-rhpl >= 0.216
 Requires:      python-rpm >= 4.2-0.61
 Requires:      python-selinux
@@ -73,7 +76,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
@@ -92,6 +95,7 @@ systemie.
 Summary:       Anaconda GTK+2 GUI
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
+# XXX: updateme
 Requires:      X11-OpenGL-core
 Requires:      X11-Xserver
 Requires:      X11-fonts
@@ -110,7 +114,6 @@ Group:              Applications/System
 AutoReqProv:   false
 Requires:      %{name} = %{version}-%{release}
 Requires:      /usr/bin/strip
-Requires:      X11
 Requires:      createrepo >= 0.4.3
 Requires:      gawk
 Requires:      glibc >= 6:2.3.6-5.1
@@ -120,7 +123,8 @@ Requires:   python
 Requires:      python-libxml2
 Requires:      python-rpm >= 4.2-0.61
 Requires:      squashfs
-Requires:      yum >= 2.4.0
+Requires:      xorg-app-mkfontdir
+Requires:      yum >= 3.2.19
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system
@@ -173,17 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 
 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
-%endif
-%ifarch ppc
-cp -a loader2/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
-%endif
-%ifarch %{x8664}
-cp -a loader2/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
-%endif
-
 %find_lang %{name}
 
 %{!?debug:%py_postclean %{_libdir}/anaconda}
@@ -194,14 +187,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc docs/*
-%{_sysconfdir}/keymaps.gz
+#%{_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 +229,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,16 +237,18 @@ 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
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
-%{_libdir}/anaconda-runtime/keymaps-override-*
-%dir %{_libdir}/anaconda-runtime/loader
-%attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init
-%attr(755,root,root) %{_libdir}/anaconda-runtime/loader/loader
-%{_libdir}/anaconda-runtime/loader/loader.tr
-%{_libdir}/anaconda-runtime/loader/unicode-linedraw-chars.txt
 %attr(755,root,root) %{_libdir}/anaconda-runtime/makestamp.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/maketreeinfo.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mapshdr