- R: new booty

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index f43e2de3403eacb34bf9dbe8698b33f689ae0b26..4153d95fed04670360355495bdfde7912f5ea8f0 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,29 +1,28 @@
 # TODO
 # - code poldek backend (python-poldek pkg exists!)
-# - pldize /etc/fstab
-# - /etc/modprobe.conf for geninitrd
 #
-%define                rel     200808292136
+%define                rel     200808310052
 Summary:       Graphical system installer
 Summary(pl.UTF-8):     Graficzny instalator systemu
 Name:          anaconda
 Version:       11.4.1.%{rel}
-Release:       1
+Release:       2
 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: 41317807e5ed60ec19a875edaf64c6a9
 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 +37,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
@@ -51,8 +50,9 @@ Requires:     hfsutils
 Requires:      jfsutils
 Requires:      lvm2
 Requires:      mdadm
+Requires:      pci-database
 Requires:      python-bdevid >= 6.0.24
-Requires:      python-booty >= 0.93
+Requires:      python-booty >= 0.93-3
 Requires:      python-cracklib
 Requires:      python-dbus
 Requires:      python-devel-tools
@@ -149,13 +149,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}" \
@@ -202,11 +195,12 @@ 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]
 %dir %{_libdir}/anaconda/installclasses
@@ -240,6 +234,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 +242,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