X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=blobdiff_plain;f=anaconda.spec;h=7c150256eaedfe7e2dcb41d151039099cf762a0a;hp=0345946df53f7d543bad5ee22a6181225916e56d;hb=dff1e76636c2145c0d76e7d990ad3d51a28101f4;hpb=3bfa0d3e3f6d336cb2885dff5a669a5f044e4561

diff --git a/anaconda.spec b/anaconda.spec
index 0345946..7c15025 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,24 +1,54 @@
+# TODO
+# - split anaconda-gui and anaconda-tui
+#
+%if 0
+# FC to PLD deps replace rules, extracted from cvs logs
+:%s#libxml2-python#python-libxml2#
+:%s#pyparted#python-parted#
+:%s#booty#python-booty#
+:%s#rhpl#python-rhpl#
+:%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:	10.89.6
-Release:	0.8
+Version:	11.0.5
+Release:	0.68
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	a4fad16ee61ffb268e0bfd6dc76ade12
+# Source0-md5:	f814e7d0011dd44c3c3cf12b6ddb5b40
 Source1:	%{name}-mk-images
 Source2:	%{name}-upd-instroot
 Source3:	%{name}-mk-images.i386
 Source4:	%{name}-scrubtree
+Source5:	%{name}-installclass-pld.py
+Source6:	%{name}-splash.png
+# Source6-md5:	6b38a868585adfd3a96a4ad16973c1f8
 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
+Patch10:	%{name}-network.patch
+Patch11:	%{name}-branding.patch
+Patch12:	%{name}-x11.patch
+Patch13:	%{name}-installclasses.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
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	elfutils-devel
 BuildRequires:	gettext-devel >= 0.11
@@ -26,36 +56,70 @@ BuildRequires:	glibc-localedb-all
 BuildRequires:	glibc-static
 BuildRequires:	gtk+2-devel
 BuildRequires:	intltool >= 0.31.2-3
-BuildRequires:	kudzu-devel >= 1.1
+BuildRequires:	kudzu-devel >= 1.2.0
 BuildRequires:	libselinux-devel >= 1.6
+BuildRequires:	libselinux-static
+BuildRequires:	libsepol-devel
+BuildRequires:	libsepol-static
 BuildRequires:	newt-devel
 BuildRequires:	newt-static
+BuildRequires:	pango-devel
 BuildRequires:	pciutils-devel
+BuildRequires:	pirut
 BuildRequires:	popt-static
-BuildRequires:	pump-devel >= 0.8.20
-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:	kudzu
-Requires:	parted >= 1.6.3-7
-Requires:	python-booty
+Requires:	X11-OpenGL-core
+Requires:	X11-Xserver
+Requires:	X11-fonts
+Requires:	device-mapper >= 1.01.05
+Requires:	dosfstools
+Requires:	e2fsprogs
+Requires:	glibc-localedb-all
+Requires:	grubby
+Requires:	hfsutils
+Requires:	jfsutils
+Requires:	kudzu > 1.2.0
+Requires:	lvm2
+Requires:	mdadm
+Requires:	pirut
+Requires:	python-booty >= 0.71-0.2
+Requires:	python-devel-tools
+Requires:	python-kickstart
 Requires:	python-libxml2
 Requires:	python-parted
-Requires:	python-rhpl > 0.63
-Requires:	python-rhpxl
+Requires:	python-rhpl >= 0.176-1.1
+Requires:	python-rhpxl >= 0.18-0.6
 Requires:	python-rpm >= 4.2-0.61
-Requires:	python-urlgrabber
+Requires:	python-snack
+Requires:	python-urlgrabber >= 2.9.8
+Requires:	reiserfsprogs
+Requires:	system-config-keyboard
 #Requires:	system-logos
+Requires:	vnc-utils
+Requires:	xfsprogs
+Requires:	yum >= 2.5.1-3
+%ifnarch s390 s390x
+Requires:	python-pyblock >= 0.7-1
+%endif
+%ifnarch s390 s390x ppc64
+Requires:	python-rhpxl
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,10 +136,19 @@ Summary:	Graphical system installer portions needed only for fresh installs
 Summary(pl):	Elementy graficznego instalatora systemu potrzebne tylko przy nowych instalacjach
 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
+Requires:	kbd
+Requires:	policycoreutils >= 1.30
 Requires:	python
 Requires:	python-libxml2
 Requires:	python-rpm >= 4.2-0.61
+Requires:	squashfs
+Requires:	yum >= 2.4.0
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system
@@ -89,13 +162,39 @@ do instalowania nowych system
 no¶ników, nie s± przewidziane do u¿ywania na ju¿ zainstalowanych
 systemach.
 
+%package debug
+Summary:	Sourcecode for Anaconda
+AutoReqProv:	false
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+
+%description debug
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
-mv -f po/{sr,sr@Latn}.po
+
+# we don't want this being visible, neither want we to kill it (the
+# other's aren't valid anyway (outdated probably).
+mv installclasses/fedora.py{,.orig}
+# we want this install class ;)
+cp %{SOURCE5} installclasses/pld.py
 
 sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile
 
@@ -107,9 +206,15 @@ if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
 	exit 1
 fi
 
-%{__make} depend
+%{__make} depend \
+	CC="%{__cc}"
+
 %{__make} \
-	RPM_OPT_FLAGS="%{rpmcflags}"
+	CC="%{__cc}" \
+	REALCC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
+
+./py-compile isys/isys.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,27 +222,48 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+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
+cp %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/anaconda/splash.png
 
 %find_lang %{name}
+%{!?debug:%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
+
+%if %{!?debug:0}%{?debug:1}
+%files debug
+%defattr(644,root,root,755)
+%{_libdir}/anaconda/*.py
+%{_libdir}/anaconda/installclasses/*.py
+%{_libdir}/anaconda/iw/*.py
+%{_libdir}/anaconda/textw/*.py
+%endif
 
 %files runtime
 %defattr(644,root,root,755)
@@ -149,19 +275,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/anaconda-runtime/boot/options.msg
 %{_libdir}/anaconda-runtime/boot/param.msg
 %{_libdir}/anaconda-runtime/boot/rescue.msg
-%{_libdir}/anaconda-runtime/boot/snake.msg
 %attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall
 %attr(755,root,root) %{_libdir}/anaconda-runtime/checkisomd5
 %attr(755,root,root) %{_libdir}/anaconda-runtime/filtermoddeps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py
-%attr(755,root,root) %{_libdir}/anaconda-runtime/genhdlist
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5
+%{_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
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/loader
-%{_libdir}/anaconda-runtime/loader/font.bgf.gz
 %{_libdir}/anaconda-runtime/loader/loader.tr
 %{_libdir}/anaconda-runtime/loader/module-info
 %{_libdir}/anaconda-runtime/loader/unicode-linedraw-chars.txt
@@ -174,15 +298,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.s390
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.x86_64
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.i386
+%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.ppc
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.x86_64
 %attr(755,root,root) %{_libdir}/anaconda-runtime/moddeps
 %attr(755,root,root) %{_libdir}/anaconda-runtime/modlist
 %attr(755,root,root) %{_libdir}/anaconda-runtime/pkgorder
 %attr(755,root,root) %{_libdir}/anaconda-runtime/pyisomd5sum.so
+%attr(755,root,root) %{_libdir}/anaconda-runtime/pyrc.py
 %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