X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=anaconda.spec;h=61f08b7418f04857801241a3959b784c3e144fae;hb=8ab83cff9decea2ff7b0f83606e6dc52af2b9062;hp=e90165717a888b6aac087dfafc539d92f15072b5;hpb=7c75e8368f4dc638b51f2a15b3cb8e6d068e113e;p=packages%2Fanaconda.git

diff --git a/anaconda.spec b/anaconda.spec
index e901657..61f08b7 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,24 +1,40 @@
+%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.1
+Version:	11.0.5
+Release:	0.20
 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
 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
 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 +42,56 @@ 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:	pump-devel >= 0.8.24-1
+BuildRequires:	pump-static >= 0.8.24-1
 BuildRequires:	python-booty
 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:	device-mapper >= 1.01.05
+Requires:	kudzu > 1.2.0
 Requires:	parted >= 1.6.3-7
+Requires:	pirut
 Requires:	python-booty
+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.170
+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
+%endif
+%ifnarch s390 s390x ppc64
+Requires:	python-rhpxl
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,9 +108,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
@@ -91,16 +137,16 @@ systemach.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -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
-cp %{SOURCE1} scripts/mk-images
-cp %{SOURCE2} scripts/upd-instroot
-cp %{SOURCE3} scripts/mk-images.i386
-cp %{SOURCE4} scripts/scrubtree
 
 %build
 # locale check
@@ -114,82 +160,81 @@ fi
 %{__make} \
 	RPM_OPT_FLAGS="%{rpmcflags}"
 
+./py-compile isys/isys.py
+
 %install
 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
+
 %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
 
 %files runtime
-%defattr(-,root,root,755)
-%{_libdir}/anaconda-runtime
-
-%changelog
-* %{date} PLD Team <feedback@pld-linux.org>
-All persons listed below can be reached at <cvs_login>@pld-linux.org
-
-$Log: anaconda.spec,v $
-Revision 1.9  2005-11-19 15:07:27  spider
-- missing br
-
-Revision 1.8  2005/11/06 16:54:15  patrys
-- added R: python-rhpxl
-
-Revision 1.7  2005/11/06 15:53:49  patrys
-- up to 10.89.6
-
-Revision 1.6  2005/10/31 19:29:58  glen
-- BR bogl-static
-- utf-8 locale check for build
-
-Revision 1.5  2005/05/03 18:03:18  patrys
-- updated
-
-Revision 1.4  2005/04/29 16:38:04  qboosh
-- locales cleanup
-
-Revision 1.3  2005/04/29 16:22:41  qboosh
-- pl, some cleanups
-
-Revision 1.2  2005/04/28 22:45:31  patrys
-- moved from DEVEL
-
-Revision 1.1.2.7  2005/04/23 23:35:46  patrys
-- fixed deps
-
-Revision 1.1.2.6  2005/04/23 22:51:30  patrys
-- fixed deps
-
-Revision 1.1.2.5  2005/04/23 21:35:57  patrys
-- fixed deps
-
-Revision 1.1.2.4  2005/04/23 18:14:22  patrys
-- working version codenamed "hangover"
-
-Revision 1.1.2.3  2005/04/23 17:59:29  patrys
-- more fixes, builds now
-
-Revision 1.1.2.2  2005/04/23 17:20:19  patrys
-- add static requirements for glibc and zlib
-
-Revision 1.1.2.1  2005/04/23 16:49:50  patrys
-- Initial PLD release
-- missing deps
-- something wrong with glibc dependency (ld is unable to find -lresolv)
+%defattr(644,root,root,755)
+%dir %{_libdir}/anaconda-runtime
+%dir %attr(755,root,root) %{_libdir}/anaconda-runtime/boot
+%attr(755,root,root) %{_libdir}/anaconda-runtime/boot/syslinux.cfg
+%{_libdir}/anaconda-runtime/boot/boot.msg
+%{_libdir}/anaconda-runtime/boot/general.msg
+%{_libdir}/anaconda-runtime/boot/options.msg
+%{_libdir}/anaconda-runtime/boot/param.msg
+%{_libdir}/anaconda-runtime/boot/rescue.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/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/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/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.ia64
+%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/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-*.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/yumcache