--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/04/12 16:17:49	1.16
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/05/26 10:13:32	1.19
@@ -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 14
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -21,6 +21,8 @@ Patch9: e-smith-backup-1.15.0-DarDesc.pa
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
@@ -36,9 +38,15 @@ Requires: perl(Digest::MD5)
 Requires: perl(File::Copy)
 Requires: perl(esmith::I18N)
 Requires: dar
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 
 %changelog
+* 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]
 
@@ -1031,6 +1039,9 @@ e-smith server central backup administra
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup