Remove bogus rogue patch applied in 3.2.5-5 with justification and
without following the structure of the mdadm package. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
parent
d0e7bf320d
commit
ddb12f7a60
@ -1,30 +0,0 @@
|
|||||||
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;
|
|
@ -1,7 +1,7 @@
|
|||||||
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
||||||
Name: mdadm
|
Name: mdadm
|
||||||
Version: 3.2.5
|
Version: 3.2.5
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
|
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
|
||||||
Source1: mdmonitor.init
|
Source1: mdmonitor.init
|
||||||
Source2: raid-check
|
Source2: raid-check
|
||||||
@ -17,7 +17,6 @@ Patch97: mdadm-3.2.3-udev.patch
|
|||||||
Patch98: mdadm-2.5.2-static.patch
|
Patch98: mdadm-2.5.2-static.patch
|
||||||
# Fedora 15, 16, 17 - only
|
# Fedora 15, 16, 17 - only
|
||||||
Patch99: mdadm-3.2.4-map-dir.patch
|
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/
|
URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
@ -59,7 +58,6 @@ is not used as the system init process.
|
|||||||
%if "%{fedora}" <= "17"
|
%if "%{fedora}" <= "17"
|
||||||
%patch99 -p1 -b .map-dir
|
%patch99 -p1 -b .map-dir
|
||||||
%endif
|
%endif
|
||||||
%patch100 -p1 -b .types
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
|
make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
|
||||||
@ -132,6 +130,10 @@ fi
|
|||||||
%{_initrddir}/*
|
%{_initrddir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 2 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-7
|
||||||
|
- Remove bogus rogue patch applied in 3.2.5-5 with justification and
|
||||||
|
without following the structure of the mdadm package.
|
||||||
|
|
||||||
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-6
|
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user