--- rpms/smeserver-mailstats/contribs7/smeserver-mailstats.spec	2008/02/15 18:10:53	1.1
+++ rpms/smeserver-mailstats/contribs7/smeserver-mailstats.spec	2008/04/11 14:28:19	1.6
@@ -1,28 +1,47 @@
+# $Id: smeserver-mailstats.spec,v 1.5 2008/04/03 12:04:56 brianread Exp $
+# Authority: brianread
+# Name: Brian Read
+
 Summary: Daily mail statistics for SME Server
 %define name smeserver-mailstats
 Name: %{name}
-%define version 0.0.2
-%define release 07
+%define version 0.0.3
+%define release 5
 Version: %{version}
-Release: %{release}
+Release: %{release}%{?dist}
 License: GPL
 Group: SME/addon
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-mailstats-0.0.2_spamfilter-stats.patch
-Patch1: smeserver-mailstats-bug3366.patch
-Patch2: smeserver-mailstats-0.6.15.patch
-Patch3: smeserver-mailstats-bug3366.patch2
-Patch4: smeserver-mailstats-configdb_multiple_open.patch
-Patch5: smeserver-mailstats-0.6.19.patch
-Packager: Charlie Brady
+Patch1:smeserver-mailstats-0.0.3-bjrupdate01.patch
+Patch2:smeserver-mailstats-0.0.3-bjrupdate02.patch
+Patch3:smeserver-mailstats-0.0.3-bjrupdate03.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release => 7.0
+BuildRequires: e-smith-devtools >= 1.13.1-03
+
 %description
 A script that via cron.d e-mails mail statistics to admin on a daily basis.
 See http://www.contribs.org/bugzilla/show_bug.cgi?id=819
 
 %changelog
+
+* Fri Apr 11 2008 Brian J Read <brianr@bjsystems.co.uk> 0.0.3-5
+- Fix up Db entries when none at all.
+
+* Thu Apr 3 2008 Brian J Read <brianr@bjsystems.co.uk> 0.0.3-4
+- Take out extra lines in mailstats.cron and remove restart crond from
+  post actions in spec file, on Shad's advice.
+
+* Tue Apr 1 2008 Brian J Read <brianr@bjsystems.co.uk> 0.0.3-3
+- Add in restart of crond so that script in cron.d is noticed
+
+* Tue Mar 25 2008 Brian J read <brianr@bjsystems.co.uk> 0.0.3-2
+- New version incorporating Charlie's changes and latest changes from bjr
+
+* Fri Feb 15 2008 Shad L. Lords <slords@mail.com> 0.0.3-1
+- Roll new version in prep for building on new buildsys
+
 * Thu Oct 11 2007 <charlie_brady@mitel.com> 0.0.2-07
 - Rename parse_args => analysis_period, and simplify substantially.
 
@@ -66,38 +85,19 @@ See http://www.contribs.org/bugzilla/sho
 %prep
 
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
 %build
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
-
-(cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
+(cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
-%files -f %{name}-%{version}-filelist
-
-%defattr(-,root,root)
 
 %clean
 /bin/rm -rf $RPM_BUILD_ROOT
 
-%pre
-
-%post
-echo ""
-echo "You must run the following commands to complete the install:"
-echo ""
-echo "/etc/e-smith/events/actions/initialize-default-databases"
-echo "/sbin/e-smith/signal-event email-update"
-echo "/usr/local/bin/svc -t /var/service/qpsmtpd"
-
-%preun
-
-%postun
+%files -f %{name}-%{version}-filelist
+%defattr(-,root,root)