--- rpms/smeserver-diskusage/contribs7/smeserver-diskusage.spec	2008/04/23 18:01:33	1.3
+++ rpms/smeserver-diskusage/contribs7/smeserver-diskusage.spec	2008/05/07 19:36:58	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-diskusage.spec,v 1.2 2008/04/22 19:49:20 snetram Exp $
+# $Id: smeserver-diskusage.spec,v 1.7 2008/05/05 19:08:58 snetram Exp $
 # Authority: darrellmay
 # Name: Darrell May
 
@@ -6,7 +6,7 @@ Summary: Disk usage panel for the SME Se
 %define name smeserver-diskusage
 Name: %{name}
 %define version 0.0.1
-%define release 5
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,9 +14,13 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-diskusage-0.0.1-locale-2008-04-22.patch
 Patch1: smeserver-diskusage-0.0.1-locale-2008-04-23.patch
+Patch2: smeserver-diskusage-0.0.1-add2general.patch
+Patch3: smeserver-diskusage-0.0.1-locale-2008-05-05.patch
+Patch4: smeserver-diskusage-0.0.1-locale-2008-05-07
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base,  smeserver-release >= 7.0
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: dmc-mitel-diskusage
 AutoReqProv: no
@@ -25,7 +29,16 @@ AutoReqProv: no
 Disk usage panel showing filesystem, i-bay and user statistics.
 
 %changelog
-* Tue Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+* Wed May 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-8
+- Apply 7 May 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-7
+- Apply 5 May 2008 locale patch
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- Add common <base> tags to e-smith-formmagick's general
+
+* Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
 - Added 23 April 2008 locale patch
 
 * Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
@@ -53,6 +66,9 @@ Disk usage panel showing filesystem, i-b
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks