--- rpms/smeserver-unjunkmgr/contribs8/smeserver-unjunkmgr.spec	2013/06/25 18:23:51	1.3
+++ rpms/smeserver-unjunkmgr/contribs8/smeserver-unjunkmgr.spec	2014/04/06 16:20:55	1.8
@@ -1,10 +1,10 @@
-# $Id: smeserver-unjunkmgr.spec,v 1.2 2013/06/25 18:03:27 unnilennium Exp $
+# $Id: smeserver-unjunkmgr.spec,v 1.7 2013/06/27 15:37:22 unnilennium Exp $
 # Authority: jesperknudsen
 # Name: Jesper Knudsen
 
 Summary: SME Server UnJunk Manager
 %define name smeserver-unjunkmgr
-%define version 2.0
+%define version 2.1
 %define release 3
 Name: %{name}
 Version: %{version}
@@ -12,8 +12,9 @@ Release: %{release}%{?dist}
 License: GPL
 Group: SME Server/addon
 Source: %{name}-%{version}.tgz
-Patch0: smeserver-unjunkmgr-2.0-patch0.patch
-Patch1: smeserver-unjunkmgr-2.0-patch1.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: e-smith-devtools
@@ -21,10 +22,23 @@ Requires: smeserver-release >= 7.0
 Requires: perl-MIME-Lite => 3
 Requires: perl-DateManip => 5.40
 Requires: mrtg
+Requires: perl-Email-Date-Format
 Obsoletes: sme-unjunkmgr
 
 %changelog
-* Tue Jun 25 2013 JP Pialasse <tests@pialasse.com> 2.0-3.sme
+* Fri Apr 4 2014 stephane de Labrusse <stephdl@de-labrusse.fr>  2.1-3.sme
+- added a unjunkmgr menu entry in the server-manager [sme : 8307] 
+
+* Thu Jun 27 2013 JP Pialasse <tests@pialasse.com> 2.1-2.sme
+- fix some php deprecated and PHP warning
+- patch1
+
+* Wed Jun 26 2013 JP Pialasse <tests@pialasse.com> 2.1-1.sme
+- update JpGraph to fix deprecated messages
+- added perl-Email-Date-Format requirement for sme8 as per wiki
+- patch ttfpatch
+
+* Tue Jun 25 2013 JP Pialasse <tests@pialasse.com> 2.0-4.sme
 - fix db default [SME: 7701]
 - patch0
 - added createlink in spec file
@@ -59,7 +73,8 @@ sends out a weekly summary where they ca
 %prep
 %setup
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks