- release 200903212130

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index 47d86950afa0eb3d0cd407960f839b1d9c561cad..f317c55224650f24978703130bb19c489e3c4bae 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,21 +1,23 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
 #
-%define                rel     200808310052
+%define                rel     200903212130
 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:       1
 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: 41317807e5ed60ec19a875edaf64c6a9
+# 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: dbus-devel
 BuildRequires: device-mapper-devel >= 1.01.05
 BuildRequires: e2fsprogs-devel
 BuildRequires: gettext-devel >= 0.11
@@ -31,7 +33,7 @@ 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
@@ -40,7 +42,9 @@ BuildRequires:        sed >= 4.0
 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
@@ -52,15 +56,16 @@ Requires:   lvm2
 Requires:      mdadm
 Requires:      pci-database
 Requires:      python-bdevid >= 6.0.24
-Requires:      python-booty >= 0.93-2
+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
@@ -71,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
@@ -118,7 +123,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
@@ -171,17 +176,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}
@@ -192,7 +186,7 @@ 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) %{_sbindir}/anaconda
@@ -254,12 +248,6 @@ rm -rf $RPM_BUILD_ROOT
 %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