X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=blobdiff_plain;f=anaconda.spec;h=e6e001d6aa4b6e9db8c532f40c53726f4fea8f55;hp=d2b2b9efe31ba05097c3231fb2cc8c46767a43b6;hb=2aaf71320ae16f423bab75f7e989f2f630257dd0;hpb=892e66ed992e83a9ad5202c1104cd649d1086265

diff --git a/anaconda.spec b/anaconda.spec
index d2b2b9e..e6e001d 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,3 +1,7 @@
+# TODO
+# - split anaconda-gui and anaconda-tui
+# - kill /mnt/runtime symlink hacks (leave the host alone!)
+#
 %if 0
 # FC to PLD deps replace rules, extracted from cvs logs
 :%s#libxml2-python#python-libxml2#
@@ -14,7 +18,7 @@ Summary:	Graphical system installer
 Summary(pl):	Graficzny instalator systemu
 Name:		anaconda
 Version:	11.0.5
-Release:	0.19
+Release:	0.72
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.bz2
@@ -23,12 +27,23 @@ 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
@@ -55,7 +70,7 @@ BuildRequires:	pirut
 BuildRequires:	popt-static
 BuildRequires:	pump-devel >= 0.8.24-1
 BuildRequires:	pump-static >= 0.8.24-1
-BuildRequires:	python-booty
+BuildRequires:	python-booty >= 0.71
 BuildRequires:	python-devel
 BuildRequires:	python-kickstart
 BuildRequires:	python-libxml2
@@ -70,20 +85,37 @@ BuildRequires:	slang-static
 BuildRequires:	yum
 BuildRequires:	zlib-devel
 BuildRequires:	zlib-static
+Requires:	/etc/pld-release
+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:	parted >= 1.6.3-7
+Requires:	lvm2
+Requires:	mdadm
 Requires:	pirut
-Requires:	python-booty
+Requires:	python-booty >= 0.71-0.6
+Requires:	python-devel-tools
+Requires:	python-gnome-canvas
 Requires:	python-kickstart
 Requires:	python-libxml2
 Requires:	python-parted
-Requires:	python-rhpl >= 0.170
-Requires:	python-rhpxl >= 0.18
+Requires:	python-rhpl >= 0.176-1.1
+Requires:	python-rhpxl >= 0.18-0.6
 Requires:	python-rpm >= 4.2-0.61
 Requires:	python-snack
-Requires:	python-urlgrabber
+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
@@ -133,6 +165,19 @@ do instalowania nowych system
 no¶ników, nie s± przewidziane do u¿ywania na ju¿ zainstalowanych
 systemach.
 
+%package debug
+Summary:	Sourcecode for Anaconda
+Summary(pl):	Kod ¼ród³owy Anacondy
+Group:		Applications/System
+AutoReqProv:	false
+Requires:	%{name} = %{version}-%{release}
+
+%description debug
+Anaconda sourcecode for debugging purposes.
+
+%description debug -l pl
+Kod ¼ród³owy Anacondy do celów diagnostycznych.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -141,10 +186,24 @@ systemach.
 %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
 
+# 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
 
 %build
@@ -155,9 +214,13 @@ 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
 
@@ -173,9 +236,10 @@ 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}
-%py_postclean %{_libdir}/anaconda
+%{!?debug:%py_postclean %{_libdir}/anaconda}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -186,7 +250,28 @@ rm -rf $RPM_BUILD_ROOT
 %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)