X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=anaconda.spec;h=72a4f2d026c147a60aa02885ed9e0b0703665c8f;hb=118a85f12b083287b477fd65aa9e87cb5fc9ba3f;hp=c51353d9d176389e8669c3f705a51212be8cc741;hpb=51106aa3bda2d85bd72932b0eca1cb324e70f0a9;p=packages%2Fanaconda.git

diff --git a/anaconda.spec b/anaconda.spec
index c51353d..72a4f2d 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -7,12 +7,14 @@
 :%s#rhpxl#python-rhpxl#
 :%s#rpm-python#python-rpm#
 :%s#gtk2-devel#gtk+2-devel#
+:%s#pykickstart#python-kickstart#
+:%s#squashfs-tools#squashfs#
 %endif
 Summary:	Graphical system installer
 Summary(pl):	Graficzny instalator systemu
 Name:		anaconda
 Version:	11.0.5
-Release:	0.2
+Release:	0.33
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.bz2
@@ -22,12 +24,18 @@ Source2:	%{name}-upd-instroot
 Source3:	%{name}-mk-images.i386
 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
+Patch5:		%{name}-libdir.patch
+Patch6:		%{name}-pld-release.patch
+Patch7:		%{name}-timezone.patch
+Patch8:		%{name}-kernel.patch
+Patch9:		%{name}-optflags.patch
 URL:		http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires:	X11-devel
 BuildRequires:	beecrypt-devel
-BuildRequires:	bogl-bterm >= 0:0.1.9-17
-BuildRequires:	bogl-devel >= 0:0.1.9-17
-BuildRequires:	bogl-static >= 0:0.1.9-17
 BuildRequires:	bzip2-devel
 BuildRequires:	device-mapper-devel >= 1.01.05
 BuildRequires:	device-mapper-static >= 1.01.05
@@ -47,37 +55,42 @@ BuildRequires:	newt-devel
 BuildRequires:	newt-static
 BuildRequires:	pango-devel
 BuildRequires:	pciutils-devel
-#BuildRequires:	pirut
+BuildRequires:	pirut
 BuildRequires:	popt-static
-BuildRequires:	pump-devel >= 0.8.20
-#BuildRequires:	pykickstart
-BuildRequires:	python-booty
+BuildRequires:	pump-devel >= 0.8.24-1
+BuildRequires:	pump-static >= 0.8.24-1
+BuildRequires:	python-booty >= 0.71
 BuildRequires:	python-devel
+BuildRequires:	python-kickstart
 BuildRequires:	python-libxml2
 BuildRequires:	python-rhpl
 BuildRequires:	python-rpm >= 4.2-0.61
 BuildRequires:	python-urlgrabber
 BuildRequires:	rpm-devel
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.234
 BuildRequires:	sed >= 4.0
 BuildRequires:	slang-static
 BuildRequires:	yum
 BuildRequires:	zlib-devel
 BuildRequires:	zlib-static
-Requires:	anaconda-help
 Requires:	device-mapper >= 1.01.05
+Requires:	glibc-localedb-all
 Requires:	kudzu > 1.2.0
+Requires:	lvm2
 Requires:	parted >= 1.6.3-7
-#Requires:	pirut
-#Requires:	pykickstart
-Requires:	python-booty
+Requires:	pirut
+Requires:	python-booty >= 0.71
+Requires:	python-devel-tools
+Requires:	python-kickstart
 Requires:	python-libxml2
 Requires:	python-parted
 Requires:	python-rhpl >= 0.170
-Requires:	python-rhpxl
+Requires:	python-rhpxl >= 0.18
 Requires:	python-rpm >= 4.2-0.61
+Requires:	python-snack
 Requires:	python-urlgrabber
-Requires:	system-logos
+#Requires:	system-logos
 Requires:	yum >= 2.5.1-3
 %ifnarch s390 s390x
 Requires:	python-pyblock >= 0.7-1
@@ -85,7 +98,6 @@ Requires:	python-pyblock >= 0.7-1
 %ifnarch s390 s390x ppc64
 Requires:	python-rhpxl
 %endif
-#Requires:	system-logos
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -105,12 +117,15 @@ AutoReqProv:	false
 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
-Requires:	squashfs-tools
+Requires:	squashfs
 Requires:	yum >= 2.4.0
 
 %description runtime
@@ -128,10 +143,18 @@ systemach.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
-mv -f po/{sr,sr@Latn}.po
 
 sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile
 
@@ -145,35 +168,49 @@ fi
 
 %{__make} depend
 %{__make} \
+	CC="%{__cc}" \
 	RPM_OPT_FLAGS="%{rpmcflags}"
 
+./py-compile isys/isys.py
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__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
+install isys/isys.py[co] $RPM_BUILD_ROOT%{_libdir}/anaconda
+
+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}
+%py_postclean %{_libdir}/anaconda
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/command-line.txt
-%doc docs/install-methods.txt
-%doc docs/kickstart-docs.txt
-%doc docs/mediacheck.txt
-%doc docs/anaconda-release-notes.txt
+%doc docs/*
 %attr(755,root,root) %{_bindir}/mini-wm
 %attr(755,root,root) %{_sbindir}/anaconda
 %{_datadir}/anaconda
-%{_libdir}/anaconda
+%dir %{_libdir}/anaconda
+%{_libdir}/anaconda/*.py[co]
+%dir %{_libdir}/anaconda/installclasses
+%{_libdir}/anaconda/installclasses/*.py[co]
+%dir %{_libdir}/anaconda/iw
+%{_libdir}/anaconda/iw/*.py[co]
+%dir %{_libdir}/anaconda/textw
+%{_libdir}/anaconda/textw/*.py[co]
+%{_libdir}/anaconda/lang-names
+%{_libdir}/anaconda/lang-table
+%{_libdir}/anaconda/lang-table-kon
+%attr(755,root,root) %{_libdir}/anaconda/*-stub
+%attr(755,root,root) %{_libdir}/anaconda/*.so
 
 %files runtime
 %defattr(644,root,root,755)
@@ -191,7 +228,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5
-%{_libdir}/anaconda-runtime/keymaps-override-i386
+%{_libdir}/anaconda-runtime/keymaps-override-*
 %attr(755,root,root) %{_libdir}/anaconda-runtime/libunicode-lite.so.1
 %dir %attr(755,root,root) %{_libdir}/anaconda-runtime/loader
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init
@@ -218,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/pythondeps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/readmap
 %attr(755,root,root) %{_libdir}/anaconda-runtime/scrubtree
-%{_libdir}/anaconda-runtime/screenfont-i386.gz
+%{_libdir}/anaconda-runtime/screenfont-*.gz
 %attr(755,root,root) %{_libdir}/anaconda-runtime/splittree.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/trimmodalias
 %attr(755,root,root) %{_libdir}/anaconda-runtime/trimpciids