--- rpms/e-smith-backup/sme7/e-smith-backup.spec	2007/09/17 17:48:55	1.6
+++ rpms/e-smith-backup/sme7/e-smith-backup.spec	2008/07/07 17:38:24	1.21
@@ -2,7 +2,7 @@ Summary: e-smith module to provide the b
 %define name e-smith-backup
 Name: %{name}
 %define version 1.15.0
-%define release 04
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -11,6 +11,19 @@ Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-backup-1.15.0-DarWorkstation.patch
 Patch1: e-smith-backup-1.15.0-reformat.patch
 Patch2: e-smith-backup-1.15.0-no_desktop_verify_restore.patch
+Patch3: e-smith-backup-1.15.0-DarWorkstation.patch2
+Patch4: e-smith-backup-1.15.0-DarWorkstation.patch3
+Patch5: e-smith-backup-1.15.0-FixCompressionSetting.patch
+Patch6: e-smith-backup-1.15.0-WrongRestoreLocationFix.patch
+Patch7: e-smith-backup-1.15.0-rmLexDuplicates.patch
+Patch8: e-smith-backup-1.15.0-tags2general.patch
+Patch9: e-smith-backup-1.15.0-DarDesc.patch
+Patch10: e-smith-backup-1.15.0-brFix.patch
+Patch11: e-smith-backup-1.15.0-fixerrmsg.patch
+Patch12: e-smith-backup-1.15.0-hours.patch
+Patch13: e-smith-backup-1.15.0-add2general.patch
+Patch14: e-smith-backup-1.15.0-FixDarExpandTemplate.patch
+Patch15: e-smith-backup-1.15.0-FixDarManagerRedirect.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -26,8 +39,51 @@ Requires: perl(Digest::MD5)
 Requires: perl(File::Copy)
 Requires: perl(esmith::I18N)
 Requires: dar
+Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* Sun Jul 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.15.0-18
+- Add common <base> tags to e-smith-formmagick's general [SME: 4286]
+
+* Sat May 31 2008 Gavin Weight <gweight@gmail.com> 1.15.0-17
+- Fix Dar manager to redirect correctly in system call. [SME: 4304]
+
+* Mon May 26 2008 Gavin Weight <gweight@gmail.com> 1.15.0-16
+- Fix Dar to expand correctly. [SME: 4304]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.15.0-15
+- Add common <base> tags to e-smith-formmagick's general [SME: 4286]
+
+* Wed Apr 09 2008 Stephen Noble <support@dungog.net> 1.15.0-14
+- Minor fix in translation of hours [SME: 4179]
+
+* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.15.0-13
+- Fix localization in restore routine [SME: 3989]
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 1.15.0-12
+- Remove <br> tag from error msg  [SME: 3989]
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 1.15.0-11
+- Move/copy Backup_Desc to Backup_Desc_Dar for 1.15 rel [SME: 4024]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.15.0-10
+- Remove <base> tags now in general [SME: 3912]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.15.0-9
+- Remove duplicate <base> entries [SME: 3887]
+
+* Thu Nov 29 2007 Gavin Weight <gweight@gmail.com> 1.15.0-8
+- Fix restore files location path. [SME: 3593]
+
+* Mon Nov 19 2007 Gavin Weight <gweight@gmail.com> 1.15.0-7
+- Fix compression setting range (Thanks JPL) . [SME: 3560]
+
+* Fri Nov 09 2007 Gavin Weight <gweight@gmail.com> 1.15.0-06
+- Enhancement to DAR code (Thanks JPL) . [SME: 3538]
+
+* Fri Oct 26 2007 Gavin Weight <gweight@gmail.com> 1.15.0-05
+- Fix up DAR code to enable backup to complete. [SME: 3373]
+
 * Tue Sep 11 2007 Charlie Brady <charlie_brady@mitel.com> 1.15.0-04
 - Remove desktop verify and desktop restore features. Note that
   lexicon entries have not been removed. [SME: 3372]
@@ -980,6 +1036,19 @@ e-smith server central backup administra
 %patch0 -p1
 %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
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup