- rel 3; use spamd.pid name (as upstream)

diff --git a/spamassassin-spamd.init b/spamassassin-spamd.init
index 615819c072b3a7a99508de307001afee33bd5c88..07c17c019a795c08d6262a536d248499adedb22a 100644 (file)
--- a/spamassassin-spamd.init
+++ b/spamassassin-spamd.init
@@ -8,7 +8,7 @@
 #              email messages for SPAM.  It is normally called by spamc \
 #              from a MDA.
 # processname: spamd
-# pidfile:     /var/run/spamassassin.pid
+# pidfile:     /var/run/spamd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -42,7 +42,7 @@ start() {
        fi
 
        msg_starting "SpamAssassin"
-       daemon /usr/bin/spamd -r /var/run/spamassassin.pid $SPAMD_OPTS
+       daemon /usr/bin/spamd -r /var/run/spamd.pid $SPAMD_OPTS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/spamd
 }
@@ -55,7 +55,7 @@ stop() {
        fi
 
        msg_stopping "SpamAssassin"
-       killproc --pidfile spamassassin.pid spamd
+       killproc --pidfile spamd.pid spamd
        RETVAL=$?
        rm -f /var/lock/subsys/spamd
 }
@@ -90,7 +90,7 @@ case "$1" in
        condrestart 7
        ;;
   status)
-       status spamd
+       status --pidfile spamd.pid spamd
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|force-reload|status}"

diff --git a/spamassassin.spec b/spamassassin.spec
index bd52fed7f1b9ca117230efc9f579476651e8929a..c1d6d536189e03b7bbcc49bea2202d2717d52bd8 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -13,7 +13,7 @@ Summary:      A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.4.1
-Release:       2
+Release:       3
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2