[svn] r6140 - trunk/rpms/syslinux

Thu Feb 7 20:15:49 CET 2008

Author: dag
Date: 2008-02-07 20:15:48 +0100 (Thu, 07 Feb 2008)
New Revision: 6140

Added:
   trunk/rpms/syslinux/syslinux-3.55.spec
   trunk/rpms/syslinux/syslinux-3.61-extlinux.patch
Modified:
   trunk/rpms/syslinux/syslinux.spec
Log:
Fixes for RHEL3 and older.

Added: trunk/rpms/syslinux/syslinux-3.55.spec
===================================================================

--- trunk/rpms/syslinux/syslinux-3.55.spec	                        (rev 0)
+++ trunk/rpms/syslinux/syslinux-3.55.spec	2008-02-07 19:15:48 UTC (rev 6140)
@@ -0,0 +1,156 @@
+# $Id: syslinux.spec 6012 2007-11-23 11:59:56Z dag $
+# Authority: dag
+# Upstream: <syslinux$zytor,com>
+
+# Rationale: If you need syslinux, you'd appreciate the latest, trust me.
+
+%define _sbindir /sbin
+
+Summary: Kernel bootloader for FAT or ISO9660 filesystems or PXE networks
+Name: syslinux
+Version: 3.55
+Release: 1
+License: GPL
+Group: Applications/System
+URL: http://syslinux.zytor.com/
+
+Source: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/syslinux-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+ExclusiveArch: i386 x86_64
+BuildRequires: nasm, perl, netpbm-progs
+Requires: mtools
+
+Obsoletes: syslinux-devel <= %{version}-%{release}
+Provides: syslinux-devel = %{version}-%{release}
+
+%description
+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.
+
+%prep
+%setup
+
+%build
+export CFLAGS="-Werror -Wno-unused -finline-limit=2000"
+%{__make} clean
+%{__make} %{?_smp_mflags} installer
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install-all \
+    INSTALLROOT="%{buildroot}" \
+    BINDIR="%{_bindir}" \
+    INCDIR="%{_includedir}" \
+    LIBDIR="%{_prefix}/lib" \
+    MANDIR="%{_mandir}" \
+    SBINDIR="%{_sbindir}"
+%{__install} -p -m0755 keytab-lilo.pl mkdiskimage syslinux2ansi.pl %{buildroot}%{_prefix}/lib/syslinux/
+%{__install} -p -m0755 unix/syslinux unix/syslinux-nomtools %{buildroot}%{_prefix}/lib/syslinux/
+
+### Clean up docroot
+%{__make} -C sample tidy
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc BUGS COPYING NEWS README TODO com32/modules/mboot.doc menu/ sample/
+%doc %{_mandir}/man1/gethostip.1*
+%doc %{_mandir}/man1/lss16toppm.1*
+%doc %{_mandir}/man1/ppmtolss16.1*
+%doc %{_mandir}/man1/syslinux.1*
+%doc %{_mandir}/man1/syslinux2ansi.1*
+%{_bindir}/gethostip
+%{_bindir}/lss16toppm
+%{_bindir}/md5pass
+%{_bindir}/ppmtolss16
+%{_bindir}/sha1pass
+%{_bindir}/syslinux
+%{_prefix}/lib/syslinux/
+%{_sbindir}/extlinux
+
+%changelog
+* Fri Jan 18 2008 Dag Wieers <dag at wieers.com> - 3.55-1
+- Updated to release 3.55.
+
+* Sun Nov 18 2007 Dag Wieers <dag at wieers.com> - 3.53-1
+- Updated to release 3.53.
+
+* Wed Sep 26 2007 Dag Wieers <dag at wieers.com> - 3.52-1
+- Updated to release 3.52.
+
+* Sat Sep 08 2007 Dag Wieers <dag at wieers.com> - 3.51-2
+- Fixed the location of syslinux on x86_64. (Matt Hyclak)
+
+* Tue Jun 12 2007 Dag Wieers <dag at wieers.com> - 3.51-1
+- Updated to release 3.51.
+
+* Sun Jun 10 2007 Dag Wieers <dag at wieers.com> - 3.50-1
+- Updated to release 3.50.
+
+* Mon Jan 29 2007 Dag Wieers <dag at wieers.com> - 3.35-1
+- Updated to release 3.35.
+
+* Sat Sep 30 2006 Dag Wieers <dag at wieers.com> - 3.31-1
+- Updated to release 3.31.
+
+* Sun Aug 27 2006 Dag Wieers <dag at wieers.com> - 3.20-1
+- Updated to release 3.20.
+
+* Sun Sep 04 2005 Dag Wieers <dag at wieers.com> - 3.11-1
+- Updated to release 3.11.
+
+* Fri Aug 26 2005 Dag Wieers <dag at wieers.com> - 3.10-1
+- Updated to release 3.10.
+
+* Mon Jul 11 2005 Dag Wieers <dag at wieers.com> - 3.09-1
+- Updated to release 3.09.
+
+* Thu May 19 2005 Dag Wieers <dag at wieers.com> - 3.08-1
+- Updated to release 3.08.
+
+* Sun Jan 16 2005 Dag Wieers <dag at wieers.com> - 3.07-1
+- Updated to release 3.07.
+
+* Mon Jan 10 2005 Dag Wieers <dag at wieers.com> - 3.06-1
+- Updated to release 3.06.
+
+* Wed Jan 05 2005 Dag Wieers <dag at wieers.com> - 3.02-1
+- Updated to release 3.02.
+
+* Mon Jan 03 2005 Dag Wieers <dag at wieers.com> - 3.01-1
+- Updated to release 3.01.
+
+* Sun Jan 02 2005 Dag Wieers <dag at wieers.com> - 3.00-1
+- Updated to release 3.00.
+
+* Mon Dec 20 2004 Dag Wieers <dag at wieers.com> - 2.13-1
+- Updated to release 2.13.
+
+* Mon Oct 11 2004 Dag Wieers <dag at wieers.com> - 2.11-2
+- Re-added libsyslinux.
+
+* Wed Aug 18 2004 Dag Wieers <dag at wieers.com> - 2.11-1
+- Updated to release 2.11.
+
+* Sat Jun 19 2004 Dag Wieers <dag at wieers.com> - 2.10-1
+- Updated to release 2.10.
+
+* Wed Apr 28 2004 Dag Wieers <dag at wieers.com> - 2.09-1
+- Updated to release 2.09.
+
+* Mon Jan 19 2004 Dag Wieers <dag at wieers.com> - 2.08-0
+- Updated to release 2.08.
+
+* Sun Nov 23 2003 Dag Wieers <dag at wieers.com> - 2.07-1
+- Updated to release 2.07.
+
+* Wed Oct 15 2003 Dag Wieers <dag at wieers.com> - 2.07-0.pre5
+- Updated to release 2.07-pre5.
+
+* Wed Oct 15 2003 Dag Wieers <dag at wieers.com> - 2.06-0
+- Initial package. (using DAR)

Added: trunk/rpms/syslinux/syslinux-3.61-extlinux.patch
===================================================================
--- trunk/rpms/syslinux/syslinux-3.61-extlinux.patch	                        (rev 0)
+++ trunk/rpms/syslinux/syslinux-3.61-extlinux.patch	2008-02-07 19:15:48 UTC (rev 6140)
@@ -0,0 +1,12 @@
+--- extlinux/extlinux.c.orig	2008-02-04 05:58:50.000000000 +0100
++++ extlinux/extlinux.c	2008-02-07 20:24:03.769868064 +0100
+@@ -40,7 +40,9 @@
+ 
+ #include <linux/fd.h>		/* Floppy geometry */
+ #include <linux/hdreg.h>	/* Hard disk geometry */
++#define statfs stupid_kernel_statfs
+ #include <linux/fs.h>		/* FIGETBSZ, FIBMAP */
++#undef statfs
+ 
+ #include "ext2_fs.h"
+ #include "../version.h"

Modified: trunk/rpms/syslinux/syslinux.spec
===================================================================
--- trunk/rpms/syslinux/syslinux.spec	2008-02-07 18:43:16 UTC (rev 6139)
+++ trunk/rpms/syslinux/syslinux.spec	2008-02-07 19:15:48 UTC (rev 6140)
@@ -33,7 +33,7 @@
 
 %prep
 %setup
-%patch0 -p0
+%patch0 -p0 -b .orig
 
 %build
 export CFLAGS="-Werror -Wno-unused -finline-limit=2000"

