libupload: Fixing memset call

[profile/ivi/syslinux.git] / syslinux.spec.in

diff --git a/syslinux.spec.in b/syslinux.spec.in
index f6d07c6..c4b466b 100644 (file)
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -11,7 +11,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{VERSION}.t
 ExclusiveArch: i386 i486 i586 i686 athlon pentium4 x86_64
 Packager: H. Peter Anvin <hpa@zytor.com>
 Buildroot: %{_tmppath}/%{name}-%{VERSION}-root
-BuildPrereq: nasm >= 0.98.39, perl, netpbm-progs
+BuildPrereq: nasm >= 2.03, perl
 Autoreq: 0
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
@@ -69,26 +69,15 @@ make CC='%{my_cc}' -C sample tidy
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{_datadir}/syslinux
-mkdir -p %{buildroot}%{_includedir}
-mkdir -p %{buildroot}/boot/extlinux %{buildroot}/etc
-mkdir -p %{buildroot}/tftpboot/pxelinux.cfg
 make CC='%{my_cc}' install-all \
        INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
-       LIBDIR=%{_datadir} INCDIR=%{_includedir}
+       LIBDIR=%{_libdir} DATADIR=%{_datadir} \
+       MANDIR=%{_mandir} INCDIR=%{_includedir} \
+       TFTPBOOT=/tftpboot EXTLINUXDIR=/boot/extlinux
 make CC='%{my_cc}' -C sample tidy
-cp mkdiskimage syslinux2ansi.pl keytab-lilo.pl %{buildroot}%{_datadir}/syslinux
-
-cp %{buildroot}%{_datadir}/syslinux/*.c32      %{buildroot}/boot/extlinux
-cp %{buildroot}%{_datadir}/syslinux/memdisk    %{buildroot}/boot/extlinux
+mkdir -p %{buildroot}/etc
 ( cd %{buildroot}/etc && ln -s ../boot/extlinux/extlinux.conf . )
 
-cp %{buildroot}%{_datadir}/syslinux/*.c32      %{buildroot}/tftpboot
-cp %{buildroot}%{_datadir}/syslinux/pxelinux.0 %{buildroot}/tftpboot
-cp %{buildroot}%{_datadir}/syslinux/memdisk    %{buildroot}/tftpboot
-
 %clean
 rm -rf %{buildroot}
 
@@ -97,20 +86,14 @@ rm -rf %{buildroot}
 %doc COPYING NEWS doc/*
 %doc sample
 %{_mandir}/man*/*
-%{_bindir}/syslinux
-%{_bindir}/ppmtolss16
-%{_bindir}/lss16toppm
-%{_bindir}/gethostip
-%{_bindir}/sha1pass
-%{_bindir}/md5pass
+%{_bindir}/*
 %{_datadir}/syslinux/*.com
 %{_datadir}/syslinux/*.exe
 %{_datadir}/syslinux/*.c32
 %{_datadir}/syslinux/*.bin
 %{_datadir}/syslinux/*.0
 %{_datadir}/syslinux/memdisk
-%{_datadir}/syslinux/*.pl
-%{_datadir}/syslinux/mkdiskimage
+%{_datadir}/syslinux/dosutil/*
 
 %files devel
 %{_datadir}/syslinux/com32
@@ -137,6 +120,13 @@ fi
 %postun
 
 %changelog
+* Fri Dec 18 2009 H. Peter Anvin <hpa@zytor.com>
+- Require NASM 2.03
+- Package dosutil
+
+* Thu May 29 2008 H. Peter Anvin <hpa@zytor.com>
+- Use install targets; clean up various paths.
+
 * Thu Jan 10 2008 H. Peter Anvin <hpa@zytor.com>
 - Add man pages.