From 5886e1bfe78a31815835367d7431c0f7d1d844f8 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@fedoraproject.org>
Date: Wed, 5 Jan 2005 15:47:25 +0000
Subject: [PATCH] - 3.02 - Make the spec a little closer to hpa's.

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 syslinux.spec | 71 ++++++++++++++++++++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c4ccea3..cb2d036 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslinux-3.00.tar.bz2
+syslinux-3.02.tar.bz2
diff --git a/sources b/sources
index b579118..d0fe1d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-160b490992bbdac6701734b9ffa581c0  syslinux-3.00.tar.bz2
+dd96fb6cd73cfc650bfc7fd9c3d8cdf2  syslinux-3.02.tar.bz2
diff --git a/syslinux.spec b/syslinux.spec
index 84ef888..57cb355 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -1,29 +1,40 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 3.00
-Release: 2
+Version: 3.02
+Release: 1
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
 Patch0: syslinux-2.08-x86_64.patch
 ExclusiveArch: i386 x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: nasm, perl, netpbm-progs
-%ifarch i386
+BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs
 Autoreq: 0
-Requires: libc.so.6
-Requires: mtools
+%ifarch i386
+Requires: mtools, libc.so.6
 %endif
 %ifarch x86_64
-Autoreq: 0
-Requires: libc.so.6()(64bit)
-Requires: mtools
+Requires: mtools, libc.so.6()(64bit)
 %endif
 
+# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
+# a system bootloader, and may be necessary for system recovery.
+%define _sbindir /sbin
+
+%package devel
+Summary: Development environment for SYSLINUX add-on modules
+Group: Development/Libraries
+
 %description
-Syslinux is a simple kernel loader. It normally loads the kernel (and an 
-optional initrd image) from a FAT filesystem. It can also be used as a
-PXE bootloader during network boots.
+SYSLINUX is a suite of bootloaders, currently supporting DOS FAT
+filesystems, Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots
+(PXELINUX), or ISO 9660 CD-ROMs (ISOLINUX).  It also includes a tool,
+MEMDISK, which loads legacy operating systems from these media.
+
+%description devel
+The SYSLINUX boot loader contains an API, called COM32, for writing
+sophisticated add-on modules.  This package contains the libraries
+necessary to compile such modules.
 
 %prep
 %setup -q -n syslinux-%{version}
@@ -32,15 +43,17 @@ PXE bootloader during network boots.
 %build
 make clean
 make installer
+make -C sample tidy
 
 %install
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_libdir}/syslinux
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_prefix}/lib/syslinux
 mkdir -p %{buildroot}%{_includedir}
-make INSTALLROOT=%{buildroot} install install-lib \
-	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
+make install-all \
+	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
        	LIBDIR=%{_prefix}/lib INCDIR=%{_includedir}
 cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_prefix}/lib/syslinux
 install -m 755 unix/syslinux-nomtools %{buildroot}%{_prefix}/lib/syslinux
@@ -59,15 +72,33 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc NEWS README TODO COPYING 
-%doc distrib.doc isolinux.doc pxelinux.doc syslinux.doc memdisk/memdisk.doc
-%{_bindir}/lss16toppm
-%{_bindir}/ppmtolss16
+%doc *.doc memdisk/*.doc
 %{_bindir}/syslinux
-%{_prefix}/lib/syslinux
+%{_sbindir}/extlinux
+%{_bindir}/ppmtolss16
+%{_bindir}/lss16toppm
 %{_bindir}/gethostip
-/sbin/extlinux
+%{_prefix}/lib/syslinux/*.com
+%{_prefix}/lib/syslinux/*.exe
+%{_prefix}/lib/syslinux/*.c32
+%{_prefix}/lib/syslinux/*.bin
+%{_prefix}/lib/syslinux/*.0
+%{_prefix}/lib/syslinux/memdisk
+%{_prefix}/lib/syslinux/*.pl
+%{_prefix}/lib/syslinux/mkdiskimage
+%{_prefix}/lib/syslinux/syslinux
+%{_prefix}/lib/syslinux/syslinux-nomtools
+
+%files devel
+%defattr(-,root,root)
+%doc sample
+%{_prefix}/lib/syslinux/com32
 
 %changelog
+* Tue Jan  4 2005 Peter Jones <pjones@redhat.com> - 3.02-1
+- 3.02
+- Make the spec a little closer to hpa's.
+
 * Mon Jan  3 2005 Peter Jones <pjones@redhat.com> - 3.00-2
 - make tag says the tag is there, make build says it's not.
   Bump release, try again.