[mdadm/f15: 13/13] Merge branch 'master' into f15

[Doug Ledford]

commit bce71ef3d6e4c05608f507f77eb34ef8f9b9cc12
Merge: 4d4edba 40a50da
Author: Doug Ledford <dledford at redhat.com>
Date:   Fri Jul 15 13:53:30 2011 -0400

    Merge branch 'master' into f15
    
    Conflicts:
    	mdadm.spec

 .gitignore                     |    2 +
 mdadm-2.5.2-static.patch       |   15 ++--
 mdadm-3.1.3-udev.patch         |   19 +++--
 mdadm-3.1.5-unused-param.patch |  130 -----------------------------
 mdadm-3.2.1-version.patch      |   24 ++++++
 mdadm-3.2.2-fixbuild.patch     |   26 ++++++
 mdadm-3.2.2-man.patch          |  178 ++++++++++++++++++++++++++++++++++++++++
 mdadm.conf                     |    1 +
 mdadm.spec                     |  122 +++++++++++++++++++++++----
 mdmonitor-takeover.service     |   11 +++
 mdmonitor.service              |   13 +++
 sources                        |    2 +-
 12 files changed, 381 insertions(+), 162 deletions(-)
---
diff --cc mdadm.spec
index 371015f,4262d15..cd4beab
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary:     The mdadm program controls Linux md devices (software RAID arrays)
  Name:        mdadm
- Version:     3.1.5
- Release:     2%{?dist}
+ Version:     3.2.2
 -Release:     4%{?dist}
++Release:     5%{?dist}
  Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.bz2
  Source1:     mdmonitor.init
  Source2:     raid-check
@@@ -76,14 -118,48 +118,58 @@@ f
  %{_mandir}/man*/md*
  %config(noreplace) %{_sysconfdir}/cron.d/*
  %config(noreplace) %{_sysconfdir}/sysconfig/*
- %ghost %attr(0700,root,root) %dir /var/run/mdadm
+ %dir %{_localstatedir}/run/%{name}/
+ %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+ 
+ %files sysvinit
+ %{_initrddir}/*
  
  %changelog
++* Fri Jul 15 2011 Doug Ledford <dledford at redhat.com> - 3.2.2-5
++- Merge rawhide mdadm to f15.  Rawhide changelog preserved even though
++  the referenced versions do not exist in f15, rawhide specific builds
++  are from 3.2.1-1 through 3.2.2-4.
++
+ * Thu Jul 14 2011 Doug Ledford <dledford at redhat.com> - 3.2.2-4
+ - Fix minor issue in man page
+ - Resolves: bz717795
+ 
+ * Thu Jul 07 2011 Milan Broz <mbroz at redhat.com> - 3.2.2-3
+ - Use unit files with systemd. (johannbg)
+ - Add sub-package sysvinit for SysV init script.
+ - Resolves: bz713573
+ 
+ * Wed Jul 06 2011 Milan Broz <mbroz at redhat.com> - 3.2.2-2
+ - Fix build on PPC.
+ - Resolves: bz719380
+ 
+ * Tue Jun 28 2011 Milan Broz <mbroz at redhat.com> - 3.2.2-1
+ - Update to latest upstream version
+ - Resolves: bz714083
+ 
+ * Tue Jun 14 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-5
+ - Fix for bz710646
+ 
+ * Thu Mar 31 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-4
+ - Somehow the 64-md-raid.rules file went missing.  Put it back.
+ - Resolves: bz692248
+ 
+ * Thu Mar 31 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-3
+ - Fix mdmonitor init script setup of SELinux on PIDPATH
+ - Resolves: bz692559
+ 
 -* Mon Mar 28 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-2
++* Mon Mar 31 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-2
+ - Restore build command to sane command instead of test command
+ 
 -* Mon Mar 28 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-1
++* Mon Mar 31 2011 Doug Ledford <dledford at redhat.com> - 3.2.1-1
+ - Update to latest upstream version
+ - Resolves: 691353
+ 
 +* Thu Mar 31 2011 Doug Ledford <dledford at redhat.com> - 3.1.5-2
 +- Fix mdmonitor init script setup of SELinux on PIDPATH
 +- Re-add udev rules file that somehow went missing
 +- Resolves: bz692559, bz692248
 +
  * Fri Mar 25 2011 Doug Ledford <dledford at redhat.com> - 3.1.5-1
  - Update to latest upstream stable release
  - Update mdadm.rules file to honor noiswmd and nodmraid command line options