rpms/etherboot/devel etherboot.spec,1.12,1.13

[Glauber Costa]

Author: glommer

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

Modified Files:
	etherboot.spec 
Log Message:
Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but
works much better while rpm bug #442105 is not fixed yet.




Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- etherboot.spec	2 Mar 2009 20:33:20 -0000	1.12
+++ etherboot.spec	3 Mar 2009 03:31:52 -0000	1.13
@@ -1,10 +1,15 @@
 %define formats  pxe rom zrom
 
+# debugging firmwares does not goes the same way as a normal program.
+# moreover, all architectures providing debuginfo for a single noarch
+# package is currently clashing in koji, so don't bother.
+%global debug_package %{nil}
+
 # the arches where we are able to actually build the binaries.
 # on the other arches, we will use the prebuilt binaries
 Name: etherboot
 Version: 5.4.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -21,15 +26,10 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%ifarch %{ix86}
 BuildRequires: perl
 BuildRequires: syslinux
 BuildRequires: mtools
-%ifarch x86_64
-BuildRequires: glibc32
-%endif
-
-BuildArch: %{ix86} x86_64
-
 
 %package pxes
 Summary: Etherboot - boot roms in .pxe format
@@ -62,12 +62,6 @@
 
 
 
-%description
-Etherboot is a software package for creating ROM images that can
-download code over an Ethernet network to be executed on an x86
-computer. Many network adapters have a socket where a ROM chip can be
-installed. Etherboot is code that can be put in such a ROM
-
 
 %description pxes
 Etherboot is a software package for creating ROM images that can
@@ -102,33 +96,39 @@
 %description zroms-kvm
 This package contains the etherboot ROMs for devices emulated by KVM,
 in .zrom format.
+%endif
+
+%description
+Etherboot is a software package for creating ROM images that can
+download code over an Ethernet network to be executed on an x86
+computer. Many network adapters have a socket where a ROM chip can be
+installed. Etherboot is code that can be put in such a ROM
+
 
 
 %prep
 %setup -q
 
 %build
+%ifarch %{ix86}
 cd src
 
 # %{optflags} wouldn't work with our hack to build the 32-bit binaries
 # 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
 sed -i -e '/undi/d' Families
 make %{?_smp_mflags} allpxes allroms allzroms %{makeflags}
+%endif
 
 
 %install
 rm -rf %{buildroot}
+%ifarch %{ix86}
 mkdir -p %{buildroot}/%{_datadir}/%{name}/
 pushd src/bin/
 for fmt in %{formats};do
@@ -148,11 +148,12 @@
 		echo %{_datadir}/%{name}/${rom}.${fmt} >> kvm.${fmt}.list
 	done
 done
+%endif
 
 %clean
 rm -rf %{buildroot}
 
-
+%ifarch %{ix86}
 %files pxes -f pxe.list
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
@@ -172,10 +173,15 @@
 %files zroms-kvm -f kvm.zrom.list
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}
+%endif
 
 
 %changelog
-* Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.4-11
+* Tue Mar 03 2009 Glauber Costa <glommer at redhat.com> - 5.4.4.13
+- Use conditionals on ix86 instead of BuildArch. This scheme is uglier, but
+  works much better while rpm bug #442105 is not fixed yet.
+
+* Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.4-12
 - bump version
 
 * Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.4-11