- release 200903212130

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index 2061400b7556ee4d252b398ebbd9d41268811725..f317c55224650f24978703130bb19c489e3c4bae 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,18 +1,17 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
 #
-%define                rel     200810111759
+%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: f0f2c7fdff6bec2a7cc532401d7802dd
-Patch0:                %{name}-loader.c.patch
+# Source0-md5: fb56c92d2c83f5a356891b2b13c7fc7b
 URL:           http://fedoraproject.org/wiki/Anaconda
 BuildRequires: NetworkManager-devel
 BuildRequires: audit-libs-devel
@@ -34,7 +33,7 @@ BuildRequires:        libsepol-devel
 BuildRequires: newt-devel
 BuildRequires: popt-devel
 BuildRequires: python-devel
-BuildRequires: python-kickstart >= 1.44
+BuildRequires: python-kickstart >= 1.50
 BuildRequires: python-rhpl
 BuildRequires: python-rpm
 BuildRequires: rpm-pythonprov
@@ -65,7 +64,7 @@ Requires:     python-iniparse
 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
@@ -153,7 +152,6 @@ Kod źródłowy Anacondy do celów diagnostycznych.
 
 %prep
 %setup -q -n %{name}-%{rel}
-%patch0 -p0
 
 %build
 %{__make} depend -j1 \
@@ -178,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 loader/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
-%endif
-%ifarch ppc
-cp -a loader/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
-%endif
-%ifarch %{x8664}
-cp -a loader/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
-%endif
-
 %find_lang %{name}
 
 %{!?debug:%py_postclean %{_libdir}/anaconda}
@@ -199,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
@@ -261,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