--- rpms/e-smith-quota/sme8/e-smith-quota.spec	2008/03/28 16:26:12	1.7
+++ rpms/e-smith-quota/sme8/e-smith-quota.spec	2010/04/28 20:33:23	1.12
@@ -1,25 +1,22 @@
+# $Id: e-smith-quota.spec,v 1.11 2009/04/13 11:28:58 bytegw Exp $
+
 Summary: e-smith server and gateway - quota module
 %define name e-smith-quota
 Name: %{name}
-%define version 1.10.0
-%define release 10
+%define version 2.2.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-quota-1.10.0.sort.patch
-Patch1: e-smith-quota-1.10.0-UntaintAccountName.patch
-Patch2: e-smith-quota-1.10.0-Limits.patch
-Patch3: e-smith-quota-1.10.0-multipartquota.patch
-Patch4: e-smith-quota-1.10.0-Untaint-acct-before-using-in-system.patch
-Patch5: e-smith-quota-1.10.0-tags2general.patch
-Patch6: e-smith-quota-1.10.0-files.patch
+Patch0: e-smith-quota-2.2.0-RemoveMountProcLine.patch
+Patch1: e-smith-quota-2.2.0-badly-formmatted-html.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.129, quota >= 3, perl-Quota
 Requires: e-smith-lib >= 1.13.1
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
 AutoReqProv: no
@@ -28,6 +25,18 @@ AutoReqProv: no
 e-smith server and gateway software - quota module.
 
 %changelog
+* Wed Apr 28 2010 Ian Wells <esmith@wellsi.com> 2.0.0-3.sme
+- Improve the HTML formatting of the modify quota panel [SME: 5867]
+
+* Mon Apr 13 2009 Gavin Weight <gweight@gmail.com> 2.2.0-2.sme
+- Remove unnecessary Mount Proc line. [SME: 4112]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.10.0-11
+- Add common <base> tags to e-smith-formmagick's general [SME: 4284]
+
 * Fri Mar 28 2008 Stephen Noble <support@dungog.net> 1.10.0-10
 - Add spacing and localise 'files' [SME: 4133]
 
@@ -472,11 +481,6 @@ e-smith server and gateway software - qu
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 mkdir -p root/etc/e-smith/events/post-{install,upgrade}