--- rpms/e-smith-backup/sme7/e-smith-backup.spec	2008/03/24 22:10:50	1.4.2.4
+++ rpms/e-smith-backup/sme7/e-smith-backup.spec	2008/04/28 23:45:10	1.4.2.8
@@ -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 20
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -27,12 +27,14 @@ Patch15: e-smith-backup-1.14.0-bklistexi
 Patch16: e-smith-backup-1.14.0-rmLexDuplicates.patch
 Patch17: e-smith-backup-1.14.0-tags2general.patch
 Patch18: e-smith-backup-1.14.0-brFix.patch
+Patch19: e-smith-backup-1.14.0-fixerrmsg.patch
+Patch20: e-smith-backup-1.14.0-add2general.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-formmagick >= 1.4.0-12
 Requires: e-smith-lib >= 1.15.1-19
 Requires: perl(Quota)
 Requires: perl(Unix::PasswdFile)
@@ -44,8 +46,17 @@ Requires: perl(File::Copy)
 Requires: perl(esmith::I18N)
 
 %changelog
+* Mon Apr 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.0-23
+- Add common <base> tags to e-smith-formmagick's general [SME: 4286]
+
+* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.14.0-22
+- Use correct patch for remove duplicates [SME: 3887]
+
+* Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.14.0-21
+- Fix localization in restore routine [SME: 3989]
+
 * Mon Mar 24 2008 Shad L. Lords <slords@mail.com> 1.14.0-20
-- Fix patches to get rid of .orig files
+- Fix patches to get rid of .orig files [SME: 4100]
 
 * Mon Mar 24 2008 Shad L. Lords <slords@mail.com> 1.14.0-19
 - Backport remove <br> from error msg. [SME: 3989]
@@ -1011,6 +1022,8 @@ e-smith server central backup administra
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup