[mdadm/f20] Revert changes introduced in 3.3-5 - the original code was correct

[Jes Sorensen]

commit b00ad520fd0d03445006148abf4703287788adf1
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Fri Jan 31 17:50:06 2014 +0100

    Revert changes introduced in 3.3-5 - the original code was correct
    
    Signed-off-by: Jes Sorensen <Jes.Sorensen at redhat.com>

 mdadm.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/mdadm.spec b/mdadm.spec
index 2b6215e..222bef4 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,7 +1,7 @@
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 Name:        mdadm
 Version:     3.3
-Release:     5%{?dist}
+Release:     6%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -57,6 +57,7 @@ install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/raid-check
 install -Dp -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules
 install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
 install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check
+mkdir -p -m 710 %{buildroot}/var/run/mdadm
 
 # systemd
 mkdir -p %{buildroot}%{_unitdir}
@@ -65,6 +66,8 @@ install -m644 %{SOURCE6} %{buildroot}%{_unitdir}
 # tmpfile
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run/
+install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 
 # abrt
 mkdir -p %{buildroot}/etc/libreport/events.d
@@ -74,9 +77,6 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d
 rm -rf %{buildroot}
 
 %post
-# /var/run/mdadm is normally created during boot, but we need to create it
-# here for the install process
-install -d -m 0710 -o root -g root %{_localstatedir}/run/%{name}
 %systemd_post mdmonitor.service
 /usr/bin/systemctl disable mdmonitor-takeover.service  >/dev/null 2>&1 || :
 
@@ -101,10 +101,16 @@ install -d -m 0710 -o root -g root %{_localstatedir}/run/%{name}
 %{_mandir}/man*/md*
 %config(noreplace) %{_sysconfdir}/cron.d/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
+%dir %{_localstatedir}/run/%{name}/
 %config(noreplace) %{_tmpfilesdir}/%{name}.conf
 /etc/libreport/events.d/*
 
 %changelog
+* Fri Jan 31 2014 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.3-6
+- Revert changes introduced in 3.3-5, they were based on incorrect
+  recommendations.
+- Resolves bz1053176
+
 * Thu Jan 30 2014 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.3-5
 - Do not create /var/run/mdadm in the rpm file, since this is sitting on
   tmpfs and is created by tmpfiles during boot.