[syslinux/f14/master] - Split out extlinux and tftpboot.

[Peter Jones]

commit 60e3c708d3c38dd2a3fcf7d2175ef35a6393b5a8
Author: Peter Jones <pjones at redhat.com>
Date:   Mon Aug 23 10:08:25 2010 -0400

    - Split out extlinux and tftpboot.

 syslinux.spec |   54 ++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 46 insertions(+), 8 deletions(-)
---
diff --git a/syslinux.spec b/syslinux.spec
index 03020f7..4ed46db 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 4.02
 %define tarball_version 4.02
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
@@ -37,6 +37,24 @@ Group: Development/Libraries
 %description devel
 Headers and libraries for syslinux development.
 
+%package extlinux
+Summary: The EXTLINUX bootloader, for booting the local system.
+Group: System/Boot
+Requires: syslinux
+
+%description extlinux
+The EXTLINUX bootloader, for booting the local system, as well as all
+the SYSLINUX/PXELINUX modules in /boot.
+
+%package tftpboot
+Summary: SYSLINUX modules in /tftpboot, available for network booting
+Group: Applications/Internet
+Requires: syslinux
+
+%description tftpboot
+All the SYSLINUX/PXELINUX modules directly available for network
+booting in the /tftpboot directory.
+
 %prep
 %setup -q -n syslinux-%{tarball_version}
 
@@ -57,18 +75,19 @@ mkdir -p %{buildroot}%{_prefix}/lib/syslinux
 mkdir -p %{buildroot}%{_includedir}
 make install-all \
 	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
-       	LIBDIR=%{_prefix}/lib INCDIR=%{_includedir} MANDIR=%{_mandir} DATADIR=%{_datadir} 
+       	LIBDIR=%{_prefix}/lib DATADIR=%{_datadir} \
+	MANDIR=%{_mandir} INCDIR=%{_includedir} \
+	TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux
 
 mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/sample
 install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}-%{version}/sample/
+mkdir -p %{buildroot}/etc
+( cd %{buildroot}/etc && ln -s ../boot/extlinux/extlinux.conf . )
 
 # don't ship libsyslinux, at least, not for now
 rm -f %{buildroot}%{_prefix}/lib/libsyslinux*
 rm -f %{buildroot}%{_includedir}/syslinux.h
 
-# don't want this for now...
-rm -rf %{buildroot}/boot %{buildroot}/tftpboot
-
 %clean
 rm -rf %{buildroot}
 
@@ -79,7 +98,6 @@ rm -rf %{buildroot}
 %doc sample
 %{_mandir}/man*/*
 %{_bindir}/*
-%{_sbindir}/extlinux
 %dir %{_datadir}/syslinux
 %{_datadir}/syslinux/*.com
 %{_datadir}/syslinux/*.exe
@@ -87,8 +105,6 @@ rm -rf %{buildroot}
 %{_datadir}/syslinux/*.bin
 %{_datadir}/syslinux/*.0
 %{_datadir}/syslinux/memdisk
-%dir %{_datadir}/syslinux/com32
-%{_datadir}/syslinux/com32/*
 %dir %{_datadir}/syslinux/dosutil
 %{_datadir}/syslinux/dosutil/*
 
@@ -97,7 +113,29 @@ rm -rf %{buildroot}
 %dir %{_datadir}/syslinux/com32
 %{_datadir}/syslinux/com32
 
+%files extlinux
+%{_sbindir}/extlinux
+/boot/extlinux
+%config /etc/extlinux.conf
+
+%files tftpboot
+/tftpboot
+
+%post extlinux
+# If we have a /boot/extlinux.conf file, assume extlinux is our bootloader
+# and update it.
+if [ -f /boot/extlinux/extlinux.conf ]; then \
+	extlinux --update /boot/extlinux ; \
+elif [ -f /boot/extlinux.conf ]; then \
+	mkdir -p /boot/extlinux && \
+	mv /boot/extlinux.conf /boot/extlinux/extlinux.conf && \
+	extlinux --update /boot/extlinux ; \
+fi
+
 %changelog
+* Fri Aug 06 2010 Peter Jones <pjones at redhat.com> - 4.02-2
+- Split out extlinux and tftpboot.
+
 * Thu Aug 05 2010 Peter Jones <pjones at redhat.com> - 4.02-1
 - Update to 4.02