[spamassassin: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/spamassassin

[Nick Bebout]

commit d384c0422cd8b17ddbeb06457aa1fae8b27b19f9
Merge: a458ea9 b1f9bf7
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Sat Aug 13 16:51:56 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/spamassassin
    
    Conflicts:
    	spamassassin.spec

 spamassassin.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc spamassassin.spec
index b3036d7,2a3ef86..76df615
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@@ -324,26 -281,17 +324,35 @@@ if [ $1 = 0 ] ; the
      /sbin/chkconfig --del spamassassin
  fi
  exit 0
 +%endif
 +
 +%if %{use_systemd}
 +if [ $1 -eq 0 ] ; then
 +    # Package removal, not upgrade
 +    /bin/systemctl --no-reload disable spamassassin.service > /dev/null 2>&1 || :
 +    /bin/systemctl stop spamassassin.service > /dev/null 2>&1 || :
 +fi
 +%endif
 +
 +%if %{use_systemd}
 +%triggerun -- spamassassin < 3.3.2-2
 +%{_bindir}/systemd-sysv-convert --save spamassassin >/dev/null 2>&1 ||:
 +
 +# Run these because the SysV package being removed won't do them
 +/sbin/chkconfig --del spamassassin >/dev/null 2>&1 || :
 +/bin/systemctl try-restart spamassassin.service >/dev/null 2>&1 || :
 +%endif
  
  %changelog
+ * Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 3.3.2-3
+ - Perl mass rebuild
+ 
+ * Tue Jul 19 2011 Petr Sabata <contyk at redhat.com> - 3.3.2-2
+ - Perl mass rebuild
+ 
+ * Thu Jun 23 2011 Nick Bebout <nb at fedoraproject.org> - 3.3.2-2
+ - Remove -d from spamassassin.sysconfig
+ 
  * Mon Jun 6 2011 Warren Togami <warren at togami.com> - 3.3.2-1
  - 3.3.2