--- rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/03/26 19:46:42	1.4.2.6
+++ rpms/e-smith-backup/sme8/e-smith-backup.spec	2008/07/28 21:08:24	1.4.2.10
@@ -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 22
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: Artistic
@@ -28,12 +28,14 @@ Patch16: e-smith-backup-1.14.0-rmLexDupl
 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
+Patch21: e-smith-backup-1.14.0-stderr.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)
@@ -45,6 +47,15 @@ Requires: perl(File::Copy)
 Requires: perl(esmith::I18N)
 
 %changelog
+* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.0-25
+- Backport patch to add common <base> tags to e-smith-formmagick's general [SME: 4286] 
+
+* Sat Jul 26 2008 Shad L. Lords <slords@mail.com> 1.14.0-24
+- Fix redirect to stderr on check tape cronjob [SME: 4458]
+
+* 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]
 
@@ -1019,6 +1030,8 @@ e-smith server central backup administra
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 /sbin/e-smith/buildtests 10e-smith-backup