From 8e20f0a2816302bf0fc6c5f2babdc402e85c3481 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 14 Jul 2006 21:34:29 +0000 Subject: [PATCH] - Remove com32/include/time.h and com32/include/sys/times.h - Replace CLK_TCK macros with CLOCKS_PER_SEC --- syslinux.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/syslinux.spec b/syslinux.spec index 47a3c57..7407b14 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -2,12 +2,13 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux Version: 3.11 %define tarball_version 3.11 -Release: 2.1 +Release: 3 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2 Patch0: syslinux-2.08-x86_64.patch Patch1: syslinux-3.07-gcc4.patch +Patch2: syslinux-3.11-time.patch ExclusiveArch: i386 x86_64 Buildroot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: nasm >= 0.98.38-1, perl, netpbm-progs @@ -35,10 +36,14 @@ MEMDISK, which loads legacy operating systems from these media. %setup -q -n syslinux-%{tarball_version} %patch0 -p1 -b .x86_64 %patch1 -p1 -b .3.07-gcc4 +%patch2 -p1 -b .time %build CFLAGS="-Werror -Wno-unused -finline-limit=2000" export CFLAGS +rm -f com32/include/time.h +rm -f com32/include/sys/times.h +# If you make clean here, we lose the provided syslinux.exe #make clean make installer make -C sample tidy @@ -90,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/syslinux/com32 %changelog +* Fri Jul 14 2006 David Cantrell - 3.11-3 +- Remove com32/include/time.h and com32/include/sys/times.h +- Replace CLK_TCK macros with CLOCKS_PER_SEC + * Wed Jul 12 2006 Jesse Keating - 3.11-2.1 - rebuild