[spamass-milter/f14] Fix for /var/run on tmpfs (#656692)

[Paul Howarth]

commit 232d1a86a1e1aaee3e8d3ea310e67595b2f4ab11
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Nov 29 16:50:18 2010 +0000

    Fix for /var/run on tmpfs (#656692)
    
    - Make sure /var/run/spamass-milter and /var/run/spamass-milter/postfix exist
      at boot time for systems with /var/run on tmpfs (#656692)

 spamass-milter-postfix-tmpfs.conf |    1 +
 spamass-milter-tmpfs.conf         |    1 +
 spamass-milter.spec               |   22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/spamass-milter-postfix-tmpfs.conf b/spamass-milter-postfix-tmpfs.conf
new file mode 100644
index 0000000..d8ef6c1
--- /dev/null
+++ b/spamass-milter-postfix-tmpfs.conf
@@ -0,0 +1 @@
+d	/var/run/spamass-milter/postfix	750	sa-milt	postfix
diff --git a/spamass-milter-tmpfs.conf b/spamass-milter-tmpfs.conf
new file mode 100644
index 0000000..27d1cb4
--- /dev/null
+++ b/spamass-milter-tmpfs.conf
@@ -0,0 +1 @@
+d	/var/run/spamass-milter		711	sa-milt	sa-milt
diff --git a/spamass-milter.spec b/spamass-milter.spec
index ba42e66..07c9c0d 100644
--- a/spamass-milter.spec
+++ b/spamass-milter.spec
@@ -1,7 +1,7 @@
 Summary:	Milter (mail filter) for spamassassin
 Name:		spamass-milter
 Version:	0.3.1
-Release:	21%{?dist}.1
+Release:	23%{?dist}
 License:	GPLv2+
 Group:		System Environment/Daemons
 URL:		http://savannah.nongnu.org/projects/spamass-milt/
@@ -10,6 +10,8 @@ Source1:	spamass-milter-wrapper
 Source2:	spamass-milter.sysv
 Source3:	spamass-milter.sysconfig
 Source4:	spamass-milter.README.Postfix
+Source5:	spamass-milter-tmpfs.conf
+Source6:	spamass-milter-postfix-tmpfs.conf
 # Patches submitted upstream:
 # http://savannah.nongnu.org/bugs/?29326
 Patch0:		spamass-milter-0.3.1-syntax.patch
@@ -105,6 +107,14 @@ export SENDMAIL=/usr/sbin/sendmail
 %{__install} -m 750 -d %{buildroot}%{_localstatedir}/run/spamass-milter/postfix
 %{__install} -m 755 spamass-milter-wrapper %{buildroot}%{_sbindir}/spamass-milter-wrapper
 
+# Make sure /var/run/spamass-milter{,/postfix} exist at boot time for systems
+# with /var/run on tmpfs (#656692)
+%if 0%{?fedora} > 14
+%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/tmpfiles.d
+%{__install} -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter.conf
+%{__install} -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/tmpfiles.d/spamass-milter-postfix.conf
+%endif
+
 %pre
 /usr/bin/getent group sa-milt >/dev/null || /usr/sbin/groupadd -r sa-milt
 /usr/bin/getent passwd sa-milt >/dev/null || \
@@ -140,6 +150,9 @@ fi
 %doc AUTHORS ChangeLog NEWS README
 %{_mandir}/man1/spamass-milter.1*
 %config(noreplace) %{_sysconfdir}/sysconfig/spamass-milter
+%if 0%{?fedora} > 14
+%{_sysconfdir}/tmpfiles.d/spamass-milter.conf
+%endif
 %{_initrddir}/spamass-milter
 %{_sbindir}/spamass-milter
 %{_sbindir}/spamass-milter-wrapper
@@ -149,9 +162,16 @@ fi
 %files postfix
 %defattr(-,root,root,-)
 %doc README.Postfix
+%if 0%{?fedora} > 14
+%{_sysconfdir}/tmpfiles.d/spamass-milter-postfix.conf
+%endif
 %dir %attr(-,sa-milt,postfix) %{_localstatedir}/run/spamass-milter/postfix/
 
 %changelog
+* Fri Nov 26 2010 Paul Howarth <paul at city-fan.org> 0.3.1-23
+- Make sure /var/run/spamass-milter and /var/run/spamass-milter/postfix exist
+  at boot time for systems with /var/run on tmpfs (#656692)
+
 * Tue Oct 05 2010 jkeating - 0.3.1-21.1
 - Rebuilt for gcc bug 634757