From d4500164ba8deee7e12827efeb13492cacaa95bb Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Mon, 16 Jul 2012 13:34:18 +0200
Subject: [PATCH] Move /etc/tmpfiles.d/mdadm.conf to /lib/tmpfiles.d/

Resolves bz840187

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 mdadm.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mdadm.spec b/mdadm.spec
index 246b2ca..dbfcd23 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.2.5
-Release:     3%{?dist}
+Release:     4%{?dist}
 Source:      http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
 Source1:     mdmonitor.init
 Source2:     raid-check
@@ -78,8 +78,8 @@ install -m644 %{SOURCE6} %{buildroot}%{_unitdir}
 install -m644 %{SOURCE7} %{buildroot}%{_unitdir}
 
 # tmpfile
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
+install -m 0644 %{SOURCE8} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
 
@@ -124,12 +124,17 @@ fi
 %config(noreplace) %{_sysconfdir}/cron.d/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
 %dir %{_localstatedir}/run/%{name}/
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%config(noreplace) %{_prefix}/lib/tmpfiles.d/%{name}.conf
 
 %files sysvinit
 %{_initrddir}/*
 
 %changelog
+* 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
+- Resolves bz840187
+
 * Mon Jun 25 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-3
 - Fix problem where reshape of RAID volume is broken after trying to
   stop all MD devices.