- don't fail if /dev/ get's --bind mounted and /dev/root already exists there

[packages/anaconda.git] / anaconda.spec

diff --git a/anaconda.spec b/anaconda.spec
index a112a3a13e5dc302eb852298af9b6f76f44a602a..0cdab51b23e91a0a0ef88009864e78cd2bbd4fd2 100644 (file)
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -14,7 +14,7 @@ Summary:      Graphical system installer
 Summary(pl):   Graficzny instalator systemu
 Name:          anaconda
 Version:       11.0.5
-Release:       0.27
+Release:       0.35
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Patch5:               %{name}-libdir.patch
 Patch6:                %{name}-pld-release.patch
 Patch7:                %{name}-timezone.patch
 Patch8:                %{name}-kernel.patch
+Patch9:                %{name}-optflags.patch
 URL:           http://fedora.redhat.com/projects/anaconda-installer/
 BuildRequires: X11-devel
 BuildRequires: beecrypt-devel
@@ -74,8 +75,14 @@ BuildRequires:       yum
 BuildRequires: zlib-devel
 BuildRequires: zlib-static
 Requires:      device-mapper >= 1.01.05
+Requires:      dosfstools
+Requires:      e2fsprogs
+Requires:      glibc-localedb-all
+Requires:      hfsutils
+Requires:      jfsutils
 Requires:      kudzu > 1.2.0
-Requires:      parted >= 1.6.3-7
+Requires:      lvm2
+Requires:      mdadm
 Requires:      pirut
 Requires:      python-booty >= 0.71
 Requires:      python-devel-tools
@@ -87,7 +94,9 @@ Requires:     python-rhpxl >= 0.18
 Requires:      python-rpm >= 4.2-0.61
 Requires:      python-snack
 Requires:      python-urlgrabber
+Requires:      reiserfsprogs
 #Requires:     system-logos
+Requires:      xfsprogs
 Requires:      yum >= 2.5.1-3
 %ifnarch s390 s390x
 Requires:      python-pyblock >= 0.7-1
@@ -148,6 +157,7 @@ systemach.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 rm -f po/no.po
 mv -f po/{eu_ES,eu}.po
@@ -162,9 +172,13 @@ if [ "$(locale -a | grep -c en_US.utf8)" = 0 ]; then
        exit 1
 fi
 
-%{__make} depend
+%{__make} depend \
+       CC="%{__cc}"
+
 %{__make} \
-       RPM_OPT_FLAGS="%{rpmcflags}"
+       CC="%{__cc}" \
+       REALCC="%{__cc}" \
+       OPTFLAGS="%{rpmcflags}"
 
 ./py-compile isys/isys.py