From 01cecd9ef00f67e9831de5086e2303dd4d6defffed1fdc51759a4666cad79d1c Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Tue, 8 May 2012 09:22:42 +0000
Subject: [PATCH] - fix build with latest kernel headers

OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=38
---
 syslinux-4.04-umode.diff | 10 ++++++++++
 syslinux.changes         |  5 +++++
 syslinux.spec            | 18 +++++++++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 syslinux-4.04-umode.diff

diff --git a/syslinux-4.04-umode.diff b/syslinux-4.04-umode.diff
new file mode 100644
index 0000000..c04c8b3
--- /dev/null
+++ b/syslinux-4.04-umode.diff
@@ -0,0 +1,10 @@
+--- 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 <linux/ext2_fs.h>	/* EXT2_IOC_* */
+ 
+ #ifndef FAT_IOCTL_GET_ATTRIBUTES
diff --git a/syslinux.changes b/syslinux.changes
index 578aff0..3067e17 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May  8 11:22:14 CEST 2012 - snwint@suse.de
+
+- fix build with latest kernel headers
+
 -------------------------------------------------------------------
 Tue Jul 26 11:46:59 CEST 2011 - snwint@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index c9406e3..f814274 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package syslinux
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,20 @@
 #
 
 
-
 Name:           syslinux
 ExclusiveArch:  %ix86 x86_64
-BuildRequires:  libpng-devel nasm netpbm python xz
+BuildRequires:  libpng-devel
+BuildRequires:  nasm
+BuildRequires:  netpbm
+BuildRequires:  python
+BuildRequires:  xz
 Url:            http://syslinux.zytor.com/
-License:        GPLv2+
-Group:          System/Boot
 Requires:       mtools
-AutoReqProv:    on
 Summary:        Boot Loader for Linux
+License:        GPL-2.0+
+Group:          System/Boot
 Version:        4.04
-Release:        8
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        isolinux-config
 Source2:        README.gfxboot
@@ -37,6 +39,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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -59,6 +62,7 @@ Authors:
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
 
 %build
 cp %{SOURCE2} .