--- rpms/smeserver-sysmon/contribs7/smeserver-sysmon.spec	2008/03/28 01:36:39	1.4
+++ rpms/smeserver-sysmon/contribs7/smeserver-sysmon.spec	2008/03/30 04:48:04	1.5
@@ -2,7 +2,7 @@ Summary: sme server system monitor
 %define name smeserver-sysmon
 Name: %{name}
 %define version 6.1
-%define release 1
+%define release 2
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
@@ -19,6 +19,9 @@ Requires: fping
 AutoReqProv: no
 
 %changelog
+* Sat Mar 29 2008 Shad L. Lords <slords@mail.com> 6.1-2
+- Clean up scripts to ensure clean upgrade
+
 * Thu Mar 27 2008 Shad L. Lords <slords@mail.com> 6.1-1
 - Upgrade to new sysmon routines
 - Make compatible with rrdtool 1.2
@@ -199,9 +202,26 @@ echo "%doc COPYING"          >> %{name}-
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ $1 -ge 2 ] ; then
+if [ $1 -ge 1 ]; then
+    /sbin/service sysmon stop &> /dev/null || :
+fi
+
+%post
+if [ $1 -ge 2 ]; then
     mkdir -p /var/lib/rrd/backup
-    /bin/mv /var/lib/rrd/*.rrd /var/lib/rrd/backup/ 2> /dev/null || :
+    /bin/mv /var/lib/rrd/*.rrd /var/lib/rrd/backup/ &> /dev/null
+    # FIXME: Fix for broken postun in previous versions (remove later)
+    /sbin/service sysmon restart &> /dev/null || :
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+    /sbin/service sysmon stop &> /dev/null || :
+fi
+
+%postun
+if [ $1 -ge 1 ]; then
+    /sbin/service sysmon restart &> /dev/null || :
 fi
 
 %files -f %{name}-%{version}-filelist