[fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.13,1.14

[Mark McLoughlin]

Author: markmc

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

Modified Files:
	etherboot.spec 
Log Message:
* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-14
- Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541)



Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- etherboot.spec	3 Mar 2009 03:31:52 -0000	1.13
+++ etherboot.spec	25 May 2009 13:39:00 -0000	1.14
@@ -9,7 +9,7 @@
 # on the other arches, we will use the prebuilt binaries
 Name: etherboot
 Version: 5.4.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Etherboot collection of boot roms
 
 Group: Development/Tools
@@ -105,27 +105,28 @@ computer. Many network adapters have a s
 installed. Etherboot is code that can be put in such a ROM
 
 
-
 %prep
 %setup -q
 
-%build
 %ifarch %{ix86}
-cd src
+# Enable PXE_DHCP_STRICT (see bug #494541)
+sed -i -e 's/# \(CFLAGS.*PXE_DHCP_STRICT\)/\1/' src/Config
+
+# undi is broken by now
+sed -i -e '/undi/d' src/Families
+%endif
 
+%build
+%ifarch %{ix86}
 # %{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'`
 %define makeflags EXTRA_CFLAGS="%{extra_cflags}"
 
-
-# undi is broken by now
-sed -i -e '/undi/d' Families
-make %{?_smp_mflags} allpxes allroms allzroms %{makeflags}
+make -C src %{?_smp_mflags} %{makeflags} allpxes allroms allzroms
 %endif
 
-
 %install
 rm -rf %{buildroot}
 %ifarch %{ix86}
@@ -177,6 +178,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 5.4.4-14
+- Enable PXE_DHCP_STRICT to fix PXE boot failures (bug #494541)
+
 * 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.