--- rpms/smeserver-mailstats/contribs9/smeserver-mailstats.spec	2014/06/17 19:26:37	1.1
+++ rpms/smeserver-mailstats/contribs9/smeserver-mailstats.spec	2020/01/07 10:12:13	1.13
@@ -1,22 +1,30 @@
 # $Id: smeserver-mailstats.spec,v 1.4 2013/09/26 17:41:31 unnilennium Exp $
 # Authority: brianread
-# Name: Brian Read
+# Name: Brian Read 
 
 Summary: Daily mail statistics for SME Server
 %define name smeserver-mailstats
 Name: %{name}
 %define version 1.1
-%define release 1
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: SME/addon
 Source: %{name}-%{version}.tgz
-#REM contribs9 Patch0: smeserver-mailstats-1.1-auth_cvm_unix_local.patch
-#REM contribs9 Patch1: smeserver-mailstats-1.1-spamfilter.patch
+Patch0: smeserver-mailstats-1.1-random-cron_and_spamfilter-stats-7-update.patch
+Patch1: smeserver-mailstats-1.1.bz8957.Create_the_mailstats_user.patch
+Patch2: smeserver-mailstats-1.1.bz8656.Spamassassin_scores_and_tags.patch
+Patch3: smeserver-mailstats-1.0-628.patch
+Patch4: smeserver-mailstats-1.1.bz9588.qpsmtpd0_96compatible.patch
+Patch5: smeserver-mailstats-1.1.bz9717-9716email_specific_stats.patch
+Patch6: smeserver-mailstats-1.1.bz9888.geoip.patch
+Patch7: smeserver-mailstats-1.1.bz10858_10327.cleanup_and_email_truncate.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: smeserver-release => 8.0
+Requires: smeserver-release => 9.0
+Requires: qpsmtpd >= 0.96
 BuildRequires: e-smith-devtools >= 1.13.1-03
 
 %description
@@ -24,6 +32,43 @@ A script that via cron.d e-mails mail st
 See http://www.contribs.org/bugzilla/show_bug.cgi?id=819
 
 %changelog
+
+* Sun Jan 5 2020 brian read <brianr@bjsystems.co.uk> 1.1-11.sme
+- [sme:10858][sme:10327] Sort out email truncate and generally cleanup code format and take out debug crud
+- Also change perl script file name to mailstats.pl
+
+* Fri Oct 18 2019 brian read <brianr@bjsystems.co.uk> 1.1-10.sme
+- fix display of geoip [SME: 9888]
+
+* Wed Oct 12 2016 brian read <brianr@bjsystems.co.uk> 1.1-9.sme
+- [sme:9716][sme:9717] add email specific stats and enhance relay monitoring and add code for smeoptimizer
+ 
+* Sun Jul 03 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-7.sme
+- set Requires qpsmtpd >=0.96
+
+* Sat Jul 02 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-6.sme
+- make compatible with qpstmpd 0.96 and new plugins [SME: 9588]
+- work in progress : html version of email
+- code by Brian Read <brianr@bjsystems.co.uk>
+- thanks to Michael Doerner for his extensive testing
+
+* Sun Apr 10 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-5.sme
+- account for all unknown qpsmtpd plugins [SME: 9434]
+- extra for "unofficial" extra clamav signatures
+- code by Brian Read <brianr@bjsystems.co.uk>
+- (only small suggestions from JP Pialasse aka Unnilennium)
+
+* Thu Jun 25 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-4
+- creates the "mailstats" user [SME: 8957]
+- Fixed the problem with Spamassassin scores and tags.
+- Also added Geoip league table [SME: 8656]
+- code done by  Brian Read <brianr@bjsystems.co.uk>
+
+* Sun Jun 14 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-3
+- added a random cron job
+- spamfilter-stats-7-update
+- code done by Brian Read <brianr@bjsystems.co.uk> and John Crisp <jcrisp@safeandsoundit.co.uk>
+
 * Mon Jun 16 2014 JP Pialasse <tests@pialasse.com> 1.1-1.sme
 - initial import to SME9 contribs
 
@@ -39,8 +84,14 @@ See http://www.contribs.org/bugzilla/sho
 
 %prep
 %setup
-#REM contribs9 %patch0 -p1 
-#REM contribs9 %patch1 -p1
+%patch0 -p1 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks