--- rpms/e-smith-backup/sme7/e-smith-backup.spec	2007/07/01 14:28:46	1.4
+++ rpms/e-smith-backup/sme7/e-smith-backup.spec	2008/02/14 21:48:26	1.4.2.2
@@ -2,7 +2,7 @@ Summary: e-smith module to provide the b
 %define name e-smith-backup
 Name: %{name}
 %define version 1.14.0
-%define release 16
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -24,11 +24,14 @@ Patch12: e-smith-backup-1.14.0-remindere
 Patch13: e-smith-backup-1.14.0-backuptype.patch3
 Patch14: e-smith-backup-1.14.0-proxyenv.patch
 Patch15: e-smith-backup-1.14.0-bklistexist.patch
+Patch16: e-smith-backup-1.14.0-rmLexDuplicates.patch
+Patch17: e-smith-backup-1.14.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.11.0-03
 BuildRequires: gettext
 BuildArchitectures: noarch
 Requires: e-smith-base
+Requires: e-smith-formmagick >= 1.4.0-9
 Requires: e-smith-lib >= 1.15.1-19
 Requires: perl(Quota)
 Requires: perl(Unix::PasswdFile)
@@ -40,6 +43,12 @@ Requires: perl(File::Copy)
 Requires: perl(esmith::I18N)
 
 %changelog
+* Thu Feb 14 2008 Gavin Weight <gweight@gmail.com> 1.14.0-18
+- Backport remove <base> tags now in general. [SME: 3912]
+
+* Mon Feb 11 2008 Gavin Weight <gweight@gmail.com> 1.14.0-17
+- Backport remove duplicates <base> entries. [SME: 3887]
+
 * Sun Jul 01 2007 Shad L. Lords <slords@mail.com> 1.14.0-16
 - Remove files/dirs that don't exist from the backup list [SME: 3115]
 
@@ -992,6 +1001,8 @@ e-smith server central backup administra
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup