--- rpms/smeserver-unjunkmgr/contribs10/smeserver-unjunkmgr.spec	2020/11/17 19:37:25	1.2
+++ rpms/smeserver-unjunkmgr/contribs10/smeserver-unjunkmgr.spec	2020/11/18 18:43:36	1.4
@@ -1,25 +1,24 @@
-# $Id: smeserver-unjunkmgr.spec,v 1.1 2020/11/16 11:07:59 brianr Exp $
+# $Id: smeserver-unjunkmgr.spec,v 1.3 2020/11/18 16:11:30 jcrisp Exp $
 # Authority: jesperknudsen
 # Name: Jesper Knudsen
 
 Summary: SME Server UnJunk Manager
 %define name smeserver-unjunkmgr
-%define version 2.1
-%define release 5
+%define version 3.0
+%define release 2
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: SME Server/addon
 Source: %{name}-%{version}.tgz
-Patch0: smeserver-unjunkmgr-2.0-ttfpatch.patch
-Patch1: smeserver-unjunkmgr-2.1-patch1.patch
-Patch2: smeserver-unjunkmgr-2.1_add_panel_to_server-manager.patch
-Patch3: smeserver-unjunkmgr-2.1-update-jpgraph-and-php-in-httpd-conf.patch
+Patch0: smeserver-unjunkmgr-bz11178-patch-ttf-dir.patch
+Patch1: smeserver-unjunkmgr-3.0-Fix-SME-Version-Check.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: e-smith-devtools
-Requires: smeserver-release >= 7.0
+Requires: smeserver-release >= 10.0
 Requires: perl-MIME-Lite => 3
 Requires: perl-DateManip => 5.40
 Requires: mrtg
@@ -27,6 +26,13 @@ Requires: perl-Email-Date-Format
 Obsoletes: sme-unjunkmgr
 
 %changelog
+* Wed Nov 18 2020 Brian Read <brianr@bjsystems.co.uk> 3.0-2.sme
+- Fix SME Version check in perl stats prgram [SME: 11178]
+
+* Wed Nov 18 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0-1.sme
+- Completely update jpgraph to 4.3.4
+- clean up various files and incorporate patches [SME: 11178]
+
 * Tue Nov 17 2020 Brian Read <brianr@bjsystems.co.uk> 2.1-5.sme
 - Update jpgraph and fix php references in httpd.conf [SME: 11178]
 
@@ -74,15 +80,14 @@ Obsoletes: sme-unjunkmgr
 - First release
 
 %description
-SME Server 7x UnJunk Manager which scan the individual users junkmail folders and
+SME Server UnJunk Manager which scan the individual users junkmail folders and
 sends out a weekly summary where they can unjunk the emails
 
 %prep
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
 %build
 perl createlinks