--- rpms/e-smith-quota/sme7/e-smith-quota.spec	2007/06/12 16:07:27	1.1
+++ rpms/e-smith-quota/sme7/e-smith-quota.spec	2008/10/07 19:17:26	1.10
@@ -1,21 +1,21 @@
+# $Id$
+
 Summary: e-smith server and gateway - quota module
 %define name e-smith-quota
 Name: %{name}
-%define version 1.10.0
-%define release 5
+%define version 2.0.0
+%define release 1
 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
 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
-BuildRequires: e-smith-devtools >= 1.11.0-03, e-smith-test >= 0.1.12
+Requires: e-smith-formmagick >= 1.4.0-12
+BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
 AutoReqProv: no
 
@@ -23,6 +23,27 @@ AutoReqProv: no
 e-smith server and gateway software - quota module.
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.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]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.10.0-9
+- Remove <base> tags now in general [SME: 3927]
+
+* Tue Feb 12 2008 chris burnat <devlist@burnat.com> 1.10.0-8
+-  Fix deletion of usernames with one character [SME: 2451]
+
+* Mon Dec 17 2007 Shad L. Lords <slords@mail.com> 1.10.0-7
+- Enable quotas for all lvm partitions [SME: 3651]
+
+* Sun Oct 14 2007 Shad L. Lords <slords@mail.com> 1.10.0-6
+- Remove unnecessary build dependency [SME: 3534]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -450,19 +471,16 @@ e-smith server and gateway software - qu
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 mkdir -p root/etc/e-smith/events/post-{install,upgrade}
 mkdir -p root/etc/e-smith/events/user-{create,modify}
 mkdir -p root/etc/e-smith/web/panels/manager/cgi-bin
 
-xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.po \
-    root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl
-xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.po \
-    root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl
+xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/adminQuotaSummary.tmpl.po \
+    root/etc/e-smith/templates/usr/lib/e-smith-quota/adminQuotaSummary.tmpl -L perl
+xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/userOverQuota.tmpl.po \
+    root/etc/e-smith/templates/usr/lib/e-smith-quota/userOverQuota.tmpl -L perl
 
 perl createlinks
 /sbin/e-smith/buildtests 50-e-smith-quota