include <linux/types.h> in some to avoid type clashes.

same problem as rhbz #840902
This commit is contained in:
Karsten Hopp 2012-07-18 16:47:43 +02:00
parent d4500164ba
commit 8233a5a683
2 changed files with 37 additions and 1 deletions

30
mdadm-3.2.5-types.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up mdadm-3.2.5/mdadm.h.types mdadm-3.2.5/mdadm.h
--- mdadm-3.2.5/mdadm.h.types 2012-07-18 15:47:05.631122187 +0200
+++ mdadm-3.2.5/mdadm.h 2012-07-18 15:47:26.978368930 +0200
@@ -24,6 +24,7 @@
#define _GNU_SOURCE
#define _FILE_OFFSET_BITS 64
+#include <linux/types.h>
#include <unistd.h>
#if !defined(__dietlibc__) && !defined(__KLIBC__)
extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
diff -up mdadm-3.2.5/msg.c.types mdadm-3.2.5/msg.c
--- mdadm-3.2.5/msg.c.types 2012-07-18 16:12:40.287970913 +0200
+++ mdadm-3.2.5/msg.c 2012-07-18 16:12:56.231408340 +0200
@@ -19,6 +19,7 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
+#include "mdadm.h"
#include <unistd.h>
#include <stdio.h>
#include <string.h>
@@ -28,7 +29,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
-#include "mdadm.h"
#include "mdmon.h"
static const __u32 start_magic = 0x5a5aa5a5;

View File

@ -1,7 +1,7 @@
Summary: The mdadm program controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 3.2.5
Release: 4%{?dist}
Release: 5%{?dist}
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
Source1: mdmonitor.init
Source2: raid-check
@ -17,6 +17,7 @@ Patch97: mdadm-3.2.3-udev.patch
Patch98: mdadm-2.5.2-static.patch
# Fedora 15, 16, 17 - only
Patch99: mdadm-3.2.4-map-dir.patch
Patch100: mdadm-3.2.5-types.patch
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
License: GPLv2+
Group: System Environment/Base
@ -58,6 +59,7 @@ is not used as the system init process.
%if "%{fedora}" <= "17"
%patch99 -p1 -b .map-dir
%endif
%patch100 -p1 -b .types
%build
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
@ -130,6 +132,10 @@ fi
%{_initrddir}/*
%changelog
* Wed Jul 18 2012 Karsten Hopp <karsten@redhat.com> 3.2.5-5
- include <linux/types.h> in some to avoid type clashes.
same problem as rhbz #840902
* Mon Jul 16 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-4
- Move /etc/tmpfiles.d/mdadm.conf to /lib/tmpfiles.d/ to comply with
Fedora tmpfile rules