rpms/s390utils/F-11 0014-s390-tools-1.8.0-headers.patch, NONE, 1.1 s390utils.spec, 1.1, 1.2

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/s390utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26098

Modified Files:
	s390utils.spec 
Added Files:
	0014-s390-tools-1.8.0-headers.patch 
Log Message:
* Fri Apr 17 2009 Dan Horák <dan[at]danny.cz> 2:1.8.0-6
- fix build with newer kernels


0014-s390-tools-1.8.0-headers.patch:

--- NEW FILE 0014-s390-tools-1.8.0-headers.patch ---
>From 35ca774b05ad30d7064536edc2042e1a525d6da5 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Fri, 17 Apr 2009 22:05:38 +0200
Subject: [PATCH] swap the order of headers' inclusion

---
 ziomon/ziomon_tools.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ziomon/ziomon_tools.c b/ziomon/ziomon_tools.c
index 5f37407..88359c6 100644
--- a/ziomon/ziomon_tools.c
+++ b/ziomon/ziomon_tools.c
@@ -7,10 +7,10 @@
  * Author(s): Stefan Raspl <raspl at linux.vnet.ibm.com>
  */
 
-#include "ziomon_tools.h"
 #include <stdio.h>
 #include <stdint.h>
 #include <assert.h>
+#include "ziomon_tools.h"
 
 
 extern int verbose;
-- 
1.6.0.6



Index: s390utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/s390utils/F-11/s390utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s390utils.spec	7 Apr 2009 08:03:09 -0000	1.1
+++ s390utils.spec	18 Apr 2009 07:16:43 -0000	1.2
@@ -8,7 +8,7 @@
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,7 @@
 Patch11:        0011-s390-tools-1.5.3-fdasd-raid.patch
 Patch12:        0012-s390-tools-1.8.0-initscript-fix.patch
 Patch13:        0013-s390-tools-1.8.0-cflags.patch
+Patch14:        0014-s390-tools-1.8.0-headers.patch
 Patch100:       cmsfs-1.1.8-warnings.patch
 Patch101:       cmsfs-1.1.8-kernel26.patch
 Patch200:       src_vipa-2.0.4-locations.patch
@@ -102,6 +103,9 @@
 # allow override of optimization level in CFLAGS
 %patch13 -p1 -b .cflags
 
+# fix the order of inclusion for glibc and kernel headers
+%patch14 -p1 -b .headers
+
 #
 # cmsfs
 #
@@ -670,6 +674,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Dan Horák <dan[at]danny.cz> 2:1.8.0-6
+- fix build with newer kernels
+
 * Wed Mar 25 2009 Dan Horák <dan[at]danny.cz> 2:1.8.0-5
 - reword the summaries a bit
 - add downloadable URLs for Sources