--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/10/16 16:15:54	1.30
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/12/09 22:02:59	1.45
@@ -1,10 +1,10 @@
-# $Id: e-smith-backup.spec,v 1.29 2008/10/16 15:00:42 snetram Exp $
+# $Id: e-smith-backup.spec,v 1.44 2008/10/29 19:38:12 slords Exp $
 
 Summary: e-smith module to provide the backup panel
 %define name e-smith-backup
 Name: %{name}
 %define version 2.2.0
-%define release 4
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -13,6 +13,19 @@ Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-backup-2.2.0-localise_fix.patch
 Patch2: e-smith-backup-2.2.0-fixPleaseConfigure.patch
 Patch3: e-smith-backup-2.2.0-restore_list.patch
+Patch4: e-smith-backup-2.2.0-timeout.patch
+Patch5: e-smith-backup-2.2.0-smbfs.patch
+Patch6: e-smith-backup-2.2.0-mount_verify.patch
+Patch7: e-smith-backup-2.2.0-nocompressogg.patch
+Patch8: e-smith-backup-2.2.0-verbose.patch
+Patch9: e-smith-backup-2.2.0-email.patch
+Patch10: e-smith-backup-2.2.0-mount_usb.patch
+Patch11: e-smith-backup-2.2.0-verbose_panel.patch
+Patch12: e-smith-backup-2.2.0-gzip.patch
+Patch13: e-smith-backup-2.2.0-empty.patch
+Patch14: e-smith-backup-2.2.0-spelling.patch
+Patch15: e-smith-backup-2.2.0-password.patch
+Patch16: e-smith-backup-2.2.0-fixCompressionLevelRange.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -31,6 +44,48 @@ Requires: dar
 Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* Tue Dec  9 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-18.sme
+- Fix discrepancy in maximum compression level [SME: 4841]
+
+* Wed Oct 29 2008 Shad L. Lords <slords@mail.com> 2.2.0-17.sme
+- Fix spelling mistakes in backup panel [SME: 4732]
+- Hide password from manager panel [SME: 4734]
+
+* Tue Oct 28 2008 Shad L. Lords <slords@mail.com> 2.2.0-16.sme
+- Migrate smbfs to cifs to complete removal [SME: 4678]
+
+* Mon Oct 27 2008 Shad L. Lords <slords@mail.com> 2.2.0-15.sme
+- Fix compression to default to gzip [SME: 4630]
+- Fix uninitialized values in backup [SME: 4720]
+
+* Sat Oct 25 2008 Stephen Noble <support@dungog.net> 2.2.0-14.sme
+- dar backup to be less verbose in panel [SME: 4719]
+
+* Sat Oct 25 2008 Stephen Noble <support@dungog.net> 2.2.0-13.sme
+- correct mounting for usb disks [SME: 4695]
+
+* Wed Oct 22 2008 Shad L. Lords <slords@mail.com> 2.2.0-12.sme
+- Fix from address on email [SME: 4702]
+
+* Tue Oct 21 2008 Shad L. Lords <slords@mail.com> 2.2.0-11.sme
+- Fix patch to remove orig file [SME: 4700]
+- Patch dar backup to be less verbose [SME: 4699]
+
+* Tue Oct 21 2008 Stephen Noble <support@dungog.net> 2.0.0-10.sme
+- no compression for ogg media files [SME: 4677]
+
+* Tue Oct 21 2008 Stephen Noble <support@dungog.net> 2.2.0-8.sme
+- replace defined list of directories to backup [SME: 4676]
+
+* Mon Oct 20 2008 Shad L. Lords <slords@mail.com> 2.2.0-7.sme
+- Fix already mounted check [SME: 4688]
+
+* Mon Oct 20 2008 Shad L. Lords <slords@mail.com> 2.2.0-6.sme
+- Remove obsolete smbfs backup method [SME: 4678]
+
+* Mon Oct 20 2008 Shad L. Lords <slords@mail.com> 2.2.0-5.sme
+- Use perl routines for timeout checking [SME: 4660]
+
 * Thu Oct 16 2008 Shad L. Lords <slords@mail.com> 2.2.0-4.sme
 - Make dar use defined list of directories to backup [SME: 4676]
 
@@ -1049,6 +1104,19 @@ e-smith server central backup administra
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup