X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=anaconda.spec;h=c76d5fa524714426b0ec21bda515cc42e7a79738;hb=35e859268c6f9274fb2a99809a44a3e21870989a;hp=f43e2de3403eacb34bf9dbe8698b33f689ae0b26;hpb=78d09d2de51b3fc11d838e9dc943de1e04d7506a;p=packages%2Fanaconda.git

diff --git a/anaconda.spec b/anaconda.spec
index f43e2de..c76d5fa 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -3,7 +3,7 @@
 # - pldize /etc/fstab
 # - /etc/modprobe.conf for geninitrd
 #
-%define		rel	200808292136
+%define		rel	200808301625
 Summary:	Graphical system installer
 Summary(pl.UTF-8):	Graficzny instalator systemu
 Name:		anaconda
@@ -13,17 +13,18 @@ License:	GPL
 Group:		Applications/System
 # http://team.pld-linux.org/~patrys/anaconda.git - origin/pld-branch
 Source0:	%{name}-%{rel}.tar.bz2
-# Source0-md5:	1a3e6c15b9080fef45b53c2a471383ce
+# Source0-md5:	895a8a16a56f83f37605978e1eebc874
 URL:		http://fedoraproject.org/wiki/Anaconda
-BuildRequires:	device-mapper-static >= 1.01.05
+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:	libdhcp-devel
-BuildRequires:	libdhcp-static
 BuildRequires:	libdhcp4client-devel
 BuildRequires:	libdhcp6client-devel
 BuildRequires:	libnl-devel
@@ -38,8 +39,8 @@ 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:	bdevid
 Requires:	device-mapper >= 1.01.05
@@ -149,13 +150,6 @@ Kod źródłowy Anacondy do celów diagnostycznych.
 %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}" \
@@ -204,9 +198,11 @@ rm -rf $RPM_BUILD_ROOT
 %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]
 %dir %{_libdir}/anaconda/installclasses
@@ -240,6 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/anaconda/*-stub
 %dir %{_libdir}/anaconda-runtime
 %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
@@ -247,6 +244,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_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/buildinstall.functions
 %attr(755,root,root) %{_libdir}/anaconda-runtime/genmodinfo