From eef306e48562968ce511273a651a0cb8396b49d0 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Aug 22 2006 14:26:10 +0000 Subject: obsolete syslinux-devel --- diff --git a/syslinux.spec b/syslinux.spec index 7407b14..a6317e7 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux Version: 3.11 %define tarball_version 3.11 -Release: 3 +Release: 4 License: GPL Group: Applications/System Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2 @@ -10,8 +10,8 @@ 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 +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: nasm >= 0.98.38-1, perl, netpbm-progs BuildRequires: /usr/include/gnu/stubs-32.h Autoreq: 0 %ifarch i386 @@ -20,6 +20,7 @@ Requires: mtools, libc.so.6 %ifarch x86_64 Requires: mtools, libc.so.6()(64bit) %endif +Obsoletes: syslinux-devel < %{version}-%{release} Provides: syslinux-devel # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically @@ -70,7 +71,7 @@ rm -f %{buildroot}%{_prefix}/lib/libsyslinux* rm -f %{buildroot}%{_includedir}/syslinux.h %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -95,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/lib/syslinux/com32 %changelog +* Tue Aug 22 2006 Jesse Keating - 3.11-4 +- Obsolete syslinux-devel. +- Couple cleanups for packaging guidelines + * 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