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

diff --git a/anaconda.spec b/anaconda.spec
index 65861ba..19a43dd 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,119 +1,126 @@
-%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
+# TODO
+# - code poldek backend (python-poldek pkg exists!)
+#
+%define		rel	200809012206
 Summary:	Graphical system installer
-Summary(pl):	Graficzny instalator systemu
+Summary(pl.UTF-8):	Graficzny instalator systemu
 Name:		anaconda
-Version:	11.0.5
-Release:	0.4
+Version:	11.4.1.%{rel}
+Release:	1
 License:	GPL
 Group:		Applications/System
-Source0:	%{name}-%{version}.tar.bz2
-# Source0-md5:	f814e7d0011dd44c3c3cf12b6ddb5b40
-Source1:	%{name}-mk-images
-Source2:	%{name}-upd-instroot
-Source3:	%{name}-mk-images.i386
-Source4:	%{name}-scrubtree
-Patch0:		%{name}-pld.patch
-Patch1:		%{name}-BUS_XEN.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
+# 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:	NetworkManager-devel
+BuildRequires:	audit-libs-devel
+# will kill it in the future
+BuildRequires:	curl
 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
-BuildRequires:	glibc-localedb-all
-BuildRequires:	glibc-static
+BuildRequires:	glib2-devel
 BuildRequires:	gtk+2-devel
-BuildRequires:	intltool >= 0.31.2-3
-BuildRequires:	kudzu-devel >= 1.2.0
+BuildRequires:	isomd5sum-devel
+BuildRequires:	libdhcp-devel
+BuildRequires:	libdhcp4client-devel
+BuildRequires:	libdhcp6client-devel
+BuildRequires:	libnl-devel
 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-kickstart
-BuildRequires:	python-booty
+BuildRequires:	popt-devel
 BuildRequires:	python-devel
-BuildRequires:	python-libxml2
+BuildRequires:	python-kickstart >= 1.42
 BuildRequires:	python-rhpl
-BuildRequires:	python-rpm >= 4.2-0.61
-BuildRequires:	python-urlgrabber
-BuildRequires:	rpm-devel
+BuildRequires:	python-rpm
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.234
 BuildRequires:	sed >= 4.0
-BuildRequires:	slang-static
-BuildRequires:	yum
+BuildRequires:	slang-devel
 BuildRequires:	zlib-devel
-BuildRequires:	zlib-static
-Requires:	anaconda-help
+Requires:	/etc/pld-release
+Requires:	NetworkManager
+Requires:	bdevid
 Requires:	device-mapper >= 1.01.05
-Requires:	kudzu > 1.2.0
-Requires:	parted >= 1.6.3-7
-Requires:	pirut
-Requires:	python-kickstart
-Requires:	python-booty
+Requires:	dosfstools
+Requires:	e2fsprogs
+Requires:	grubby
+Requires:	hal
+Requires:	hfsutils
+Requires:	jfsutils
+Requires:	lvm2
+Requires:	mdadm
+Requires:	pci-database
+Requires:	python-bdevid >= 6.0.24
+Requires:	python-booty >= 0.93-4
+Requires:	python-cracklib
+Requires:	python-dbus
+Requires:	python-devel-tools
+Requires:	python-iniparse
+Requires:	python-kickstart >= 1.42
+Requires:	python-libuser
 Requires:	python-libxml2
-Requires:	python-parted
-Requires:	python-rhpl >= 0.170
-Requires:	python-rhpxl
+Requires:	python-parted >= 1.8.9
+Requires:	python-rhpl >= 0.216
 Requires:	python-rpm >= 4.2-0.61
-Requires:	python-urlgrabber
-#Requires:	system-logos
-Requires:	yum >= 2.5.1-3
+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 >= 3.2.19
 %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
 The anaconda package contains the program which can be used to install
 system. These files are of little use on an already installed system.
 
-%description -l pl
-Pakiet anaconda zawiera program, którego mo¿na u¿yæ do zainstalowania
-systemu. Pliki te maj± niewiele zastosowañ na ju¿ zainstalowanym
+%description -l pl.UTF-8
+Pakiet anaconda zawiera program, którego można użyć do zainstalowania
+systemu. Pliki te mają niewiele zastosowań na już zainstalowanym
 systemie.
 
+%package gui
+Summary:	Anaconda GTK+2 GUI
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	X11-OpenGL-core
+Requires:	X11-Xserver
+Requires:	X11-fonts
+Requires:	python-gnome-canvas
+Requires:	python-pygtk-glade
+Requires:	system-config-date
+Requires:	system-config-keyboard
+
+%description gui
+Anaconda GUI portion.
+
 %package runtime
 Summary:	Graphical system installer portions needed only for fresh installs
-Summary(pl):	Elementy graficznego instalatora systemu potrzebne tylko przy nowych instalacjach
+Summary(pl.UTF-8):	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-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
-Requires:	yum >= 2.4.0
+Requires:	yum >= 3.2.19
 
 %description runtime
 The anaconda-runtime package contains parts of the installation system
@@ -121,33 +128,42 @@ which are needed for installing new systems. These files are used to
 build media sets, but are not meant for use on already installed
 systems.
 
-%description runtime -l pl
+%description runtime -l pl.UTF-8
 Pakiet anaconda-runtime zawiera elementy instalatora potrzebne tylko
-do instalowania nowych systemów. Pliki te s³u¿± do tworzenia zestawu
-no¶ników, nie s± przewidziane do u¿ywania na ju¿ zainstalowanych
+do instalowania nowych systemów. Pliki te służą do tworzenia zestawu
+nośników, nie są przewidziane do używania na już zainstalowanych
 systemach.
 
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%package debug
+Summary:	Sourcecode for Anaconda
+Summary(pl.UTF-8):	Kod źródłowy Anacondy
+Group:		Applications/System
+AutoReqProv:	false
+Requires:	%{name} = %{version}-%{release}
 
-rm -f po/no.po
-mv -f po/{eu_ES,eu}.po
+%description debug
+Anaconda sourcecode for debugging purposes.
 
-sed -i -e 's/$(PYTHON) scripts/python scripts/' Makefile
+%description debug -l pl.UTF-8
+Kod źródłowy Anacondy do celów diagnostycznych.
+
+%prep
+%setup -q -n %{name}-%{rel}
 
 %build
-# locale check
-if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
-	echo >&2 "en_US.utf8 locale not available. build will fail!"
-	echo >&2 "Install glibc-localedb-all or compile it!"
-	exit 1
-fi
+%{__make} depend -j1 \
+	PYTHON="%{__python}" \
+	PYTHONINCLUDE="%{py_incdir}" \
+	CC="%{__cc}"
+
+%{__make} -j1 \
+	PYTHON="%{__python}" \
+	PYTHONINCLUDE="%{py_incdir}" \
+	CC="%{__cc}" \
+	REALCC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
 
-%{__make} depend
-%{__make} \
-	RPM_OPT_FLAGS="%{rpmcflags}"
+./py-compile isys/isys.py
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -155,74 +171,112 @@ 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
+
+# for ./isys/lang.c:isysLoadKeymap()
+%ifarch %{ix86}
+cp -a loader/keymaps-i386 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+%endif
+%ifarch ppc
+cp -a loader/keymaps-ppc $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+%endif
+%ifarch %{x8664}
+cp -a loader/keymaps-x86_64 $RPM_BUILD_ROOT%{_sysconfdir}/keymaps.gz
+%endif
 
 %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
-%attr(755,root,root) %{_bindir}/mini-wm
+%doc docs/*
+%{_sysconfdir}/keymaps.gz
+/etc/security/console.apps/liveinst
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/liveinst
 %attr(755,root,root) %{_sbindir}/anaconda
+%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]
+%dir %{_libdir}/anaconda/installclasses
+%{_libdir}/anaconda/installclasses/*.py[co]
+%dir %{_libdir}/anaconda/textw
+%{_libdir}/anaconda/textw/*.py[co]
+%{_libdir}/anaconda/lang-names
+%{_libdir}/anaconda/lang-table
+%attr(755,root,root) %{_libdir}/anaconda/_isys.so
+
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mini-wm
+%attr(755,root,root) %{_libdir}/anaconda/xutils.so
+%{_desktopdir}/liveinst.desktop
+%dir %{_libdir}/anaconda/iw
+%{_libdir}/anaconda/iw/*.py[co]
 %{_datadir}/anaconda
-%{_libdir}/anaconda
+
+%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)
+%attr(755,root,root) %{_libdir}/anaconda/*-stub
 %dir %{_libdir}/anaconda-runtime
-%dir %attr(755,root,root) %{_libdir}/anaconda-runtime/boot
-%attr(755,root,root) %{_libdir}/anaconda-runtime/boot/syslinux.cfg
+%dir %{_libdir}/anaconda-runtime/boot
+%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/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/buildinstall.functions
+%attr(755,root,root) %{_libdir}/anaconda-runtime/genmodinfo
 %attr(755,root,root) %{_libdir}/anaconda-runtime/getkeymaps
-%attr(755,root,root) %{_libdir}/anaconda-runtime/implantisomd5
-%{_libdir}/anaconda-runtime/keymaps-override-i386
-%attr(755,root,root) %{_libdir}/anaconda-runtime/libunicode-lite.so.1
-%dir %attr(755,root,root) %{_libdir}/anaconda-runtime/loader
+%{_libdir}/anaconda-runtime/keymaps-override-*
+%dir %{_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/loader.tr
-%{_libdir}/anaconda-runtime/loader/module-info
 %{_libdir}/anaconda-runtime/loader/unicode-linedraw-chars.txt
 %attr(755,root,root) %{_libdir}/anaconda-runtime/makestamp.py
+%attr(755,root,root) %{_libdir}/anaconda-runtime/maketreeinfo.py
 %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.i386
+%attr(755,root,root) %{_libdir}/anaconda-runtime/mk-images.alpha
 %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_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/mk-images.x86
 %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
-%attr(755,root,root) %{_libdir}/anaconda-runtime/splittree.py
-%attr(755,root,root) %{_libdir}/anaconda-runtime/trimmodalias
+%{_libdir}/anaconda-runtime/screenfont-*.gz
 %attr(755,root,root) %{_libdir}/anaconda-runtime/trimpciids
 %attr(755,root,root) %{_libdir}/anaconda-runtime/upd-instroot
-%attr(755,root,root) %{_libdir}/anaconda-runtime/yumcache
+%attr(755,root,root) %{_libdir}/anaconda-runtime/upd-updates