rpms/etherboot/devel etherboot.spec,1.10,1.11

[Glauber Costa]

Author: glommer

Update of /cvs/pkgs/rpms/etherboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28626

Modified Files:
	etherboot.spec 
Log Message:
Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch




Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- etherboot.spec	2 Mar 2009 19:57:36 -0000	1.10
+++ etherboot.spec	2 Mar 2009 20:11:29 -0000	1.11
@@ -4,7 +4,7 @@
 # on the other arches, we will use the prebuilt binaries
 Name: etherboot
 Version: 5.4.4
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -24,7 +24,11 @@
 BuildRequires: perl
 BuildRequires: syslinux
 BuildRequires: mtools
-BuildArch: %{ix86}
+%ifarch x86_64
+BuildRequires: glibc32
+%endif
+
+BuildArch: %{ix86} x86_64
 
 
 %package pxes
@@ -110,7 +114,12 @@
 # on x86_64, so use %{__global_cflags} instead, that doesn't include
 # -m64 & related flags
 %define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'`
+%ifarch x86_64
+# flags needed to build the 32-bit binaries on x86_64
+%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386"
+%else
 %define makeflags EXTRA_CFLAGS="%{extra_cflags}"
+%endif
 
 
 # undi is broken by now
@@ -166,6 +175,9 @@
 
 
 %changelog
+* Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.5-11
+- Due to a not yet fixed bug in rpm, have to keep x86_64 in BuildArch
+
 * Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.5-10
 - No more prebuilt binaries. Koji now supports noarch subpackages