rpms/gpxe/F-10 gpxe.spec,1.1,1.2

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/gpxe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23082

Modified Files:
	gpxe.spec 
Log Message:
handle isolinux changing paths


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/F-10/gpxe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpxe.spec	12 May 2009 12:10:45 -0000	1.1
+++ gpxe.spec	12 May 2009 13:18:49 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:    gpxe
 Version: 0.9.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -75,8 +75,11 @@ cp -a %{SOURCE1} .
 
 %build
 %ifarch %{buildarches}
+# Fedora 10 and newer, location is in /usr/share.  Older is in /usr/lib.
+ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
+[ -e /usr/lib/syslinux/isolinux.bin ] && ISOLINUX_BIN=/usr/lib/syslinux/isolinux.bin
 cd src
-make %{?_smp_mflags} ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
+make %{?_smp_mflags} ISOLINUX_BIN=${ISOLINUX_BIN}
 make %{?_smp_mflags} bin/gpxe.lkrn
 # The bnx2 firmware is too large to fit into an option ROM.
 rm drivers/net/bnx2*.[ch]
@@ -136,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue May 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-3
+- handle isolinux changing paths
+
 * Sat May  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-2
 - add dist tag