SPECS: anaconda.spec - bunch of fixes, re-enable overriden scripts

[glen]

Author: glen                         Date: Wed May 17 21:57:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bunch of fixes, re-enable overriden scripts

---- Files affected:
SPECS:
   anaconda.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/anaconda.spec
diff -u SPECS/anaconda.spec:1.21 SPECS/anaconda.spec:1.22
--- SPECS/anaconda.spec:1.21	Wed May 17 21:50:34 2006
+++ SPECS/anaconda.spec	Wed May 17 23:57:53 2006
@@ -15,7 +15,7 @@
 Summary(pl):	Graficzny instalator systemu
 Name:		anaconda
 Version:	11.0.5
-Release:	0.4
+Release:	0.12
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.bz2
@@ -26,6 +26,9 @@
 Source4:	%{name}-scrubtree
 Patch0:		%{name}-pld.patch
 Patch1:		%{name}-BUS_XEN.patch
+Patch2:		%{name}-vserver-proc.patch
+Patch3:		%{name}-pkgorder.patch
+Patch4:		%{name}-errorhandling.patch
 URL:		http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires:	X11-devel
 BuildRequires:	beecrypt-devel
@@ -105,9 +108,11 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	/usr/bin/strip
 Requires:	X11
-Requires:	createrepo >= 0.4.3-3.1
+Requires:	createrepo >= 0.4.3
 Requires:	gawk
 Requires:	glibc >= 6:2.3.6-5.1
+Requires:	kbd
+Requires:	policycoreutils >= 1.30
 Requires:	python
 Requires:	python-libxml2
 Requires:	python-rpm >= 4.2-0.61
@@ -130,6 +135,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
@@ -154,10 +162,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-#cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images
-#cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/upd-instroot
-#cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images.i386
-#cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/scrubtree
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/upd-instroot
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/mk-images.i386
+cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/anaconda-runtime/scrubtree
 
 %find_lang %{name}
 
@@ -232,6 +240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/05/17 21:57:53  glen
+- bunch of fixes, re-enable overriden scripts
+
 Revision 1.21  2006/05/17 19:50:34  glen
 - bogl was removed
 - require glibc with dependancy on tzdata
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/anaconda.spec?r1=1.21&r2=1.22&f=u