From 5165899bddbc4875f17ce28e6c1f6780eebf2f6e Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:54:48 +0000
Subject: [PATCH] auto-import changelog data from syslinux-2.06-1.src.rpm Fri
 Aug 22 2003 Jeremy Katz <katzj@redhat.com> 2.06-1 - 2.06 Thu Aug 14 2003
 Jeremy Katz <katzj@redhat.com> 2.05-1 - update to 2.05 Mon Apr 21 2003 Jeremy
 Katz <katzj@redhat.com> 2.04-2 - add patch for samples to build on x86_64 -
 integrate some changes from upstream specfile (#88593) Fri Apr 18 2003 Jeremy
 Katz <katzj@redhat.com> 2.04-1 - update to 2.04 Mon Feb 03 2003 Jeremy Katz
 <katzj@redhat.com> 2.01-1 - update to 2.01

---
 .cvsignore    |  2 +-
 sources       |  2 +-
 syslinux.spec | 39 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1911452..5daf8ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslinux-2.00.tar.bz2
+syslinux-2.06.tar.bz2
diff --git a/sources b/sources
index cf166f8..e70c4c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd1746a138f3390e1876994c96a26490  syslinux-2.00.tar.bz2
+c3be5acc14742ad7b23cb6cdf63725c6  syslinux-2.06.tar.bz2
diff --git a/syslinux.spec b/syslinux.spec
index b2a0be2..9907108 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -1,20 +1,23 @@
 Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
-Version: 2.00
-Release: 4
-License: BSD
+Version: 2.06
+Release: 1
+License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2
+Patch0: syslinux-2.04-x86_64.patch
 ExclusiveArch: i386 x86_64
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: nasm, perl
 %ifarch i386
 Autoreq: 0
 Requires: libc.so.6
+Requires: mtools
 %endif
 %ifarch x86_64
 Autoreq: 0
 Requires: libc.so.6()(64bit)
+Requires: mtools
 %endif
 
 %description
@@ -24,6 +27,7 @@ PXE bootloader during network boots.
 
 %prep
 %setup -q -n syslinux-%{version}
+%patch0 -p1 -b .x86_64
 
 %build
 make clean
@@ -32,12 +36,21 @@ make installer
 %install
 rm -rf %{buildroot}
 
-mkdir -p %{buildroot}/usr/bin
-make INSTALLROOT=%{buildroot} install
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_libdir}/syslinux
+mkdir -p %{buildroot}%{_includedir}
+make INSTALLROOT=%{buildroot} install install-lib \
+	INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
+       	LIBDIR=%{_prefix}/lib INCDIR=%{_includedir}
+cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_prefix}/lib/syslinux
 
 mkdir -p %{buildroot}/%{_docdir}/%{name}-%{version}/sample
 install -m 644 sample/sample.* %{buildroot}/%{_docdir}/%{name}-%{version}/sample/
 
+# don't ship libsyslinux, at least, not for now
+rm -f %{buildroot}%{_prefix}/lib/libsyslinux*
+rm -f %{buildroot}%{_includedir}/syslinux.h
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -52,6 +65,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gethostip
 
 %changelog
+* Fri Aug 22 2003 Jeremy Katz <katzj@redhat.com> 2.06-1
+- 2.06
+
+* Thu Aug 14 2003 Jeremy Katz <katzj@redhat.com> 2.05-1
+- update to 2.05
+
+* Mon Apr 21 2003 Jeremy Katz <katzj@redhat.com> 2.04-2
+- add patch for samples to build on x86_64
+- integrate some changes from upstream specfile (#88593)
+
+* Fri Apr 18 2003 Jeremy Katz <katzj@redhat.com> 2.04-1
+- update to 2.04
+
+* Mon Feb  3 2003 Jeremy Katz <katzj@redhat.com> 2.01-1
+- update to 2.01
+
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt