From 0ad081dcb5e476420e7e34e1d1887303f7009b5f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sun, 16 Feb 2014 12:05:05 -0700
Subject: [PATCH] Simplify systemd unit file. Thanks misc. Fixes bug #1065762

---
 spamassassin.service   | 4 +---
 spamassassin.spec      | 5 ++++-
 spamassassin.sysconfig | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spamassassin.service b/spamassassin.service
index 1b4b468..6e93eec 100644
--- a/spamassassin.service
+++ b/spamassassin.service
@@ -3,11 +3,9 @@ Description=Spamassassin daemon
 After=syslog.target network.target
 
 [Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
 EnvironmentFile=-/etc/sysconfig/spamassassin
 ExecStartPre=-/sbin/portrelease spamd
-ExecStart=/usr/bin/spamd --pidfile /var/run/spamd.pid $SPAMDOPTIONS
+ExecStart=/usr/bin/spamd $SPAMDOPTIONS
 StandardOutput=syslog
 StandardError=syslog
 Restart=always
diff --git a/spamassassin.spec b/spamassassin.spec
index 2738cbc..6003395 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -69,7 +69,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.4.0
 #Release: 0.8.%{prerev}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -365,6 +365,9 @@ fi
 %endif
 
 %changelog
+* Sun Feb 16 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-2
+- Simplify systemd unit file. Thanks misc. Fixes bug #1065762
+
 * Tue Feb 11 2014 Kevin Fenzi <kevin@scrye.com> 3.4.0-1
 - Update to 3.4.0
 
diff --git a/spamassassin.sysconfig b/spamassassin.sysconfig
index 70b21ed..3adfc95 100644
--- a/spamassassin.sysconfig
+++ b/spamassassin.sysconfig
@@ -1,2 +1,2 @@
 # Options to spamd
-SPAMDOPTIONS="-d -c -m5 -H"
+SPAMDOPTIONS="-c -m5 -H"