X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanaconda.git;a=blobdiff_plain;f=anaconda.spec;h=19a43dd7c1b963740e6ed94f8895c64e6286872a;hp=71eb5e4e126f581bc3e5034c1f60d06c534f22be;hb=1601995d004b34a89f826db110e7b597a36f035e;hpb=c04ae8006085b6bddf2dbbf105fd0d66da16e37c

diff --git a/anaconda.spec b/anaconda.spec
index 71eb5e4..19a43dd 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,131 +1,79 @@
 # TODO
-# - repodata is searched from PLD and PLD/RPMS paths, so go figure
 # - code poldek backend (python-poldek pkg exists!)
-# - kill /mnt/runtime symlink hacks (leave the host alone!)
-# - 01:20:59 ERROR   : lokkit run failed: /usr/sbin/lokkit can not be run
-# - lrwxrwxrwx  1 root root     11 Aug 31 04:21 menu.lst -> ./grub.conf (DEAD LINK)
-#   -rw-r--r--  1 root root    551 Aug 31 04:21 menu.lst.rpmsave
-# - can't find font latcyrheb
-#  LANG="en_US.UTF-8"
-#  SYSFONT="latarcyrheb-sun16"
-# - pldize sysconfig/timezone
-# - yuminstaller downloads all packages twice
-#  1156976072.958    317 192.168.2.3 TCP_MISS/200 209182 GET http://distrib/pld/dists/ac/PLD/i686/PLD/RPMS/sed-4.1.5-2.i686.rpm - DIRECT/x.x.x.x application/x-rpm
-#  1156976073.808    701 192.168.2.3 TCP_HIT/200 209188 GET http://distrib/pld/dists/ac/PLD/i686/PLD/RPMS/sed-4.1.5-2.i686.rpm - NONE/- application/x-rpm
-# - network config files are not pld-style nor even path
-# - lvm2-initrd should be installed
-# - pldize /etc/fstab
-# - /etc/modprobe.conf for geninitrd
-# - gui installer packages selector:
-#Traceback (most recent call last):
-#  File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/gui.py", line 954, in nextClicked
-#  File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/gui.py", line 1313, in setScreen
-#  File "/home/glen/tmp/anaconda-11.0.5-root-glen//usr/lib/anaconda/iw/package_gui.py", line 29, in getScreen
-#  File "/usr/share/python2.4/site-packages/pirut/GroupSelector.py", line 410, in doRefresh
-#  File "/usr/share/python2.4/site-packages/pirut/GroupSelector.py", line 407, in populateCategories
-#TypeError: iter should be a GtkTreeIter
-# - definition of anaconda pixmaps: http://www.raimokoski.com/lineox/Distro-definition-dir.txt
 #
-%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
+%define		rel	200809012206
 Summary:	Graphical system installer
 Summary(pl.UTF-8):	Graficzny instalator systemu
 Name:		anaconda
-Version:	11.4.0.10
-Release:	0.1
+Version:	11.4.1.%{rel}
+Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	875574321cf9795f853db61fb05ed7ff
-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
-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
-Patch13:	%{name}-installclasses.patch
-Patch14:	%{name}-release_notes_viewer_gui.patch
-Patch15:	%{name}-hosttree.patch
-Patch16:	%{name}-popt.patch
+# http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch
+Source0:	%{name}-%{rel}.tar.bz2
+# Source0-md5:	3d95f45c92662958a1e91af7c77b19ea
 URL:		http://fedoraproject.org/wiki/Anaconda
-BuildRequires:	bzip2-devel
-BuildRequires:	device-mapper-static >= 1.01.05
+BuildRequires:	NetworkManager-devel
+BuildRequires:	audit-libs-devel
+# will kill it in the future
+BuildRequires:	curl
+BuildRequires:	device-mapper-devel >= 1.01.05
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gettext-devel >= 0.11
-BuildRequires:	glib2-static
-BuildRequires:	glibc-static
+BuildRequires:	glib2-devel
 BuildRequires:	gtk+2-devel
 BuildRequires:	isomd5sum-devel
-BuildRequires:	kudzu-devel >= 1.2.68
 BuildRequires:	libdhcp-devel
-BuildRequires:	libdhcp-static
 BuildRequires:	libdhcp4client-devel
-BuildRequires:	libdhcp6client-static
-BuildRequires:	libnl-static
-BuildRequires:	libselinux-static >= 1.6
-BuildRequires:	libsepol-static
-BuildRequires:	newt-static
-BuildRequires:	popt-static
+BuildRequires:	libdhcp6client-devel
+BuildRequires:	libnl-devel
+BuildRequires:	libselinux-devel >= 1.6
+BuildRequires:	libsepol-devel
+BuildRequires:	newt-devel
+BuildRequires:	popt-devel
 BuildRequires:	python-devel
+BuildRequires:	python-kickstart >= 1.42
 BuildRequires:	python-rhpl
 BuildRequires:	python-rpm
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.234
 BuildRequires:	sed >= 4.0
-BuildRequires:	slang-static
-BuildRequires:	zlib-static
+BuildRequires:	slang-devel
+BuildRequires:	zlib-devel
 Requires:	/etc/pld-release
+Requires:	NetworkManager
 Requires:	bdevid
 Requires:	device-mapper >= 1.01.05
 Requires:	dosfstools
 Requires:	e2fsprogs
-Requires:	glibc-localedb-all
 Requires:	grubby
 Requires:	hal
 Requires:	hfsutils
 Requires:	jfsutils
-Requires:	kudzu >= 1.2.34.3-1.1
 Requires:	lvm2
 Requires:	mdadm
+Requires:	pci-database
 Requires:	python-bdevid >= 6.0.24
-Requires:	python-booty >= 0.93
+Requires:	python-booty >= 0.93-4
+Requires:	python-cracklib
 Requires:	python-dbus
 Requires:	python-devel-tools
-Requires:	python-kickstart >= 1.23
+Requires:	python-iniparse
+Requires:	python-kickstart >= 1.42
 Requires:	python-libuser
 Requires:	python-libxml2
 Requires:	python-parted >= 1.8.9
-Requires:	python-rhpl >= 0.212
+Requires:	python-rhpl >= 0.216
 Requires:	python-rpm >= 4.2-0.61
 Requires:	python-selinux
 Requires:	python-snack
 Requires:	python-urlgrabber >= 2.9.8
 Requires:	reiserfsprogs
 Requires:	system-config-date >= 1.9.17
+Requires:	tzdata
+Requires:	util-linux
 Requires:	xfsprogs
-Requires:	yum >= 2.5.1-3
+Requires:	yum >= 3.2.19
 %ifnarch s390 s390x
 Requires:	python-pyblock >= 0.7-1
 %endif
@@ -147,16 +95,10 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	X11-OpenGL-core
 Requires:	X11-Xserver
 Requires:	X11-fonts
-Requires:	pirut
 Requires:	python-gnome-canvas
+Requires:	python-pygtk-glade
 Requires:	system-config-date
 Requires:	system-config-keyboard
-Requires:	system-logos
-Requires:	vnc-server
-Requires:	vnc-utils
-%ifnarch s390 s390x ppc64
-Requires:	python-rhpxl >= 0.25
-%endif
 
 %description gui
 Anaconda GUI portion.
@@ -178,7 +120,7 @@ Requires:	python
 Requires:	python-libxml2
 Requires:	python-rpm >= 4.2-0.61
 Requires:	squashfs
-Requires:	yum >= 2.4.0
+Requires:	yum >= 3.2.19
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system
@@ -206,49 +148,9 @@ Anaconda sourcecode for debugging purposes.
 Kod źródłowy Anacondy do celów diagnostycznych.
 
 %prep
-%setup -q
-# looks obsolete
-#%patch0 -p1
-#%patch2 -p1
-%patch3 -p1
-# obsolete, all parts merged
-#%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-# fixme
-#%patch9 -p1
-# obsolete, already merged
-# %patch10 -p1
-%patch11 -p1
-#?
-#%patch13 -p1
-#?
-#%patch14 -p1
-# does it make any harm?
-#%patch15 -p1
-%patch16 -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
+%setup -q -n %{name}-%{rel}
 
 %build
-# locale check
-if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
-	: "en_US.utf8 locale not available. build will fail!"
-	: "Install glibc-localedb-all or compile it!"
-	exit 1
-fi
-
 %{__make} depend -j1 \
 	PYTHON="%{__python}" \
 	PYTHONINCLUDE="%{py_incdir}" \
@@ -271,32 +173,21 @@ rm -rf $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
-
 # for ./isys/lang.c:isysLoadKeymap()
 %ifarch %{ix86}
-cp -a loader2/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 %ifarch ppc
-cp -a loader2/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 %ifarch %{x8664}
-cp -a loader2/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+cp -a loader/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
 %endif
 
 %find_lang %{name}
 
-# hack so py_postclean would preserve it
-#install $RPM_BUILD_ROOT%{_libdir}/anaconda/iw/release_notes{.py,}
-
 %{!?debug:%py_postclean %{_libdir}/anaconda}
 
-cp %{SOURCE5} $RPM_BUILD_ROOT/%{_libdir}/anaconda/installclasses/pld.py
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -306,17 +197,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/keymaps.gz
 /etc/security/console.apps/liveinst
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/liveinst
-%attr(755,root,root) %{_bindir}/liveinst
 %attr(755,root,root) %{_sbindir}/anaconda
-%attr(755,root,root) %{_sbindir}/gptsync
 %attr(755,root,root) %{_sbindir}/liveinst
+%ifnarch ppc
+%attr(755,root,root) %{_sbindir}/gptsync
 %attr(755,root,root) %{_sbindir}/showpart
+%endif
 %dir %{_libdir}/anaconda
 %{_libdir}/anaconda/*.py[co]
-%exclude %{_libdir}/anaconda/xsetup.py[co]
 %dir %{_libdir}/anaconda/installclasses
 %{_libdir}/anaconda/installclasses/*.py[co]
-%{_libdir}/anaconda/installclasses/*.py
 %dir %{_libdir}/anaconda/textw
 %{_libdir}/anaconda/textw/*.py[co]
 %{_libdir}/anaconda/lang-names
@@ -328,7 +218,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mini-wm
 %attr(755,root,root) %{_libdir}/anaconda/xutils.so
 %{_desktopdir}/liveinst.desktop
-%{_libdir}/anaconda/xsetup.py[co]
 %dir %{_libdir}/anaconda/iw
 %{_libdir}/anaconda/iw/*.py[co]
 %{_datadir}/anaconda
@@ -347,19 +236,27 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda/*-stub
 %dir %{_libdir}/anaconda-runtime
 %dir %{_libdir}/anaconda-runtime/boot
-%attr(755,root,root) %{_libdir}/anaconda-runtime/boot/syslinux.cfg
+%ifnarch ppc
 %{_libdir}/anaconda-runtime/boot/boot.msg
 %{_libdir}/anaconda-runtime/boot/general.msg
+%{_libdir}/anaconda-runtime/boot/grub.conf
 %{_libdir}/anaconda-runtime/boot/options.msg
 %{_libdir}/anaconda-runtime/boot/param.msg
 %{_libdir}/anaconda-runtime/boot/rescue.msg
+%{_libdir}/anaconda-runtime/boot/syslinux.cfg
+%else
+%{_libdir}/anaconda-runtime/boot/bootinfo.txt
+%{_libdir}/anaconda-runtime/boot/magic
+%{_libdir}/anaconda-runtime/boot/mapping
+%{_libdir}/anaconda-runtime/boot/ofboot.b
+%{_libdir}/anaconda-runtime/boot/yaboot.conf.3264
+%{_libdir}/anaconda-runtime/boot/yaboot.conf.in
+%endif
 %attr(755,root,root) %{_libdir}/anaconda-runtime/buildinstall
-%attr(755,root,root) %{_libdir}/anaconda-runtime/filtermoddeps
-%attr(755,root,root) %{_libdir}/anaconda-runtime/fixmtime.py
+%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-*
-%attr(755,root,root) %{_libdir}/anaconda-runtime/libunicode-lite.so.1
 %dir %{_libdir}/anaconda-runtime/loader
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/init
 %attr(755,root,root) %{_libdir}/anaconda-runtime/loader/loader
@@ -370,25 +267,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mapshdr
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.alpha
-%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.i386
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.ia64
+%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.efi
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.ppc
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.s390
 %attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.x86
-%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.i386
-%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-rescueimage.ia64
-%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/pyrc.py
 %attr(755,root,root) %{_libdir}/anaconda-runtime/readmap
 %attr(755,root,root) %{_libdir}/anaconda-runtime/scrubtree
 %{_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
 %attr(755,root,root) %{_libdir}/anaconda-runtime/upd-instroot
 %attr(755,root,root) %{_libdir}/anaconda-runtime/upd-updates
-%attr(755,root,root) %{_libdir}/anaconda-runtime/yumcache