diff --git a/syslinux-4.04-libext2fs.diff b/syslinux-4.04-libext2fs.diff new file mode 100644 index 0000000..0a3ef58 --- /dev/null +++ b/syslinux-4.04-libext2fs.diff @@ -0,0 +1,11 @@ +--- libinstaller/linuxioctl.h ++++ libinstaller/linuxioctl.h +@@ -19,7 +19,7 @@ + + #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ + #undef SECTOR_BITS +-#include /* EXT2_IOC_* */ ++#include /* EXT2_IOC_* */ + + #ifndef FAT_IOCTL_GET_ATTRIBUTES + # define FAT_IOCTL_GET_ATTRIBUTES _IOR('r', 0x10, __u32) diff --git a/syslinux-4.04-umode.diff b/syslinux-4.04-umode.diff deleted file mode 100644 index c04c8b3..0000000 --- a/syslinux-4.04-umode.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- libinstaller/linuxioctl.h 2011-04-18 23:24:17.000000000 +0200 -+++ libinstaller/linuxioctl.h 2012-05-08 11:20:12.864813538 +0200 -@@ -19,6 +19,7 @@ - - #undef SECTOR_SIZE /* Defined in msdos_fs.h for no good reason */ - #undef SECTOR_BITS -+typedef unsigned short umode_t; /* moved into __KERNEL__ */ - #include /* EXT2_IOC_* */ - - #ifndef FAT_IOCTL_GET_ATTRIBUTES diff --git a/syslinux.changes b/syslinux.changes index b6ecc62..91ce201 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 31 14:41:55 CEST 2012 - snwint@suse.de + +- take headers from libext2fs-devel + ------------------------------------------------------------------- Tue May 15 13:31:20 CEST 2012 - snwint@suse.de diff --git a/syslinux.spec b/syslinux.spec index 18914ee..80aef16 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -18,6 +18,7 @@ Name: syslinux ExclusiveArch: %ix86 x86_64 +BuildRequires: libext2fs-devel BuildRequires: libpng-devel BuildRequires: nasm BuildRequires: netpbm @@ -39,7 +40,7 @@ Patch2: %{name}-%{version}-noinitrd.diff Patch3: %{name}-%{version}-mboot_bootif.diff Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff Patch5: %{name}-%{version}-md5pass.diff -Patch6: %{name}-%{version}-umode.diff +Patch6: %{name}-%{version}-libext2fs.diff Patch7: %{name}-%{version}-gcc47.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build