--- rpms/smeserver-sysmon/contribs9/smeserver-sysmon.spec	2015/09/23 22:49:09	1.2
+++ rpms/smeserver-sysmon/contribs9/smeserver-sysmon.spec	2018/01/18 17:28:36	1.7
@@ -1,4 +1,4 @@
-# $Id: smeserver-sysmon.spec,v 1.1 2015/09/23 22:46:16 stephdl Exp $
+# $Id: smeserver-sysmon.spec,v 1.6 2018/01/15 16:53:20 jcrisp Exp $
 # Authority: slords
 # Name: Shad L. Lords
 
@@ -6,7 +6,7 @@ Summary: sme server system monitor
 %define name smeserver-sysmon
 Name: %{name}
 %define version 6.4
-%define release 1
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
@@ -21,9 +21,22 @@ Requires: rrdtool >= 1.2
 Requires: perl(RRDs)
 Requires: fping
 AutoReqProv: no
+Patch0: smeserver-sysmon-6.4.change_rrd_network_label.patch
+Patch1: smeserver-sysmon-6.4.fix_swap_information.patch
 
 %changelog
-* Thu Sep 24 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 6.4-1.sme
+* Thu Jan 18 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 6.4-6.sme
+- Fix database backups iunspec file [[SME: 7096]]
+
+* Mon Jan 15 2018 John Crisp <jcrisp@safeandsoundit.co.uk> 6.4-5.sme
+- Fix missing swap information [[SME: 10493]]
+- Remove unnecessary daemonising line
+
+* Thu Sep 24 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 6.4-4.sme
+- Network labels have changed in rrdtools
+- Added smeserver-sysmon-6.4.change_rrd_network_label.patch
+
+* Thu Sep 24 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 6.4-2.sme
 - Initial release to contribs9
 
 * Wed Aug 15 2012 JP Pialasse <tests@pialasse.com> 6.2-2.sme
@@ -33,10 +46,12 @@ AutoReqProv: no
 - Initial version
 
 %description
-System monitor for SME Server version 7
+System monitor for SME Server version 9
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -58,12 +73,10 @@ fi
 
 %post
 if [ $1 -ge 2 ]; then
-    mkdir -p /var/lib/rrd/backup
-    /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 || :