# HG changeset patch
# User carl
# Date 1188500744 25200
# Node ID 44021d570958648470bf7eca413f633a29da12ef
# Parent  6bac960af6b40bbb2abbedab57f8c3d55c92aa53
fix pre/post scripts in rpm spec file


diff -r 6bac960af6b4 -r 44021d570958 ChangeLog
--- a/ChangeLog	Thu Aug 30 11:08:46 2007 -0700
+++ b/ChangeLog	Thu Aug 30 12:05:44 2007 -0700
@@ -2,6 +2,7 @@
 
 6.07 2007-08-30
     Add generic reverse dns filtering with regular expression.
+    Fix pre/post scripts in the rpm spec file.
 
 6.06 2007-08-27
     Fix bug that effectively disabled spamassassin filtering. Improve
diff -r 6bac960af6b4 -r 44021d570958 dnsbl.spec.in
--- a/dnsbl.spec.in	Thu Aug 30 11:08:46 2007 -0700
+++ b/dnsbl.spec.in	Thu Aug 30 12:05:44 2007 -0700
@@ -69,10 +69,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/@PACKAGE@/.spamassassin
 
 %pre
+/usr/bin/getent passwd @PACKAGE@ >/dev/null || useradd -r -d %{_sysconfdir}/@PACKAGE@ -M -c "@PACKAGE@ pseudo-user" -s /sbin/nologin @PACKAGE@ >/dev/null
 
 
 %post
-/usr/bin/getent passwd @PACKAGE@ >/dev/null || useradd -r -d %{_sysconfdir}/@PACKAGE@ -M -c "@PACKAGE@ pseudo-user" -s /sbin/nologin @PACKAGE@ >/dev/null
 /sbin/chkconfig --add @PACKAGE@
 echo Remember to edit %{_sysconfdir}/@PACKAGE@/@PACKAGE@.conf and add the following line to your sendmail.mc:
 echo "INPUT_MAIL_FILTER(\`dnsbl', \`S=local:/var/run/dnsbl/dnsbl.sock, F=T, T=C:30s;S:5m;R:5m;E:5m')"
@@ -80,7 +80,7 @@
 
 
 %preun
-/sbin/service @PACKAGE@ stop || :
+[ $1 = 0 ] && /sbin/service @PACKAGE@ stop || :
 
 
 %postun
@@ -104,6 +104,9 @@
 
 
 %changelog
+* Thu Aug 30 2007 Carl Byington 6.07
+- Add generic rdns filtering, fix pre/post scripts
+
 * Sun Aug 26 2007 Carl Byington 6.04
 - require spamassassin