--- rpms/smeserver-dar2/contribs7/smeserver-dar2.spec	2008/04/23 18:13:29	1.9
+++ rpms/smeserver-dar2/contribs7/smeserver-dar2.spec	2008/04/28 23:21:44	1.12
@@ -1,4 +1,4 @@
-# $Id: smeserver-dar2.spec,v 1.8 2008/04/23 17:58:06 snetram Exp $
+# $Id: smeserver-dar2.spec,v 1.11 2008/04/26 09:38:58 snetram Exp $
 # Authority: darrellmay
 # Name: Darrell May
 
@@ -6,7 +6,7 @@ Summary: Disk ARchive for SME Server
 %define name smeserver-dar2
 Name: %{name}
 %define version 0.0.1
-%define release 9
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,17 +18,22 @@ Patch2: smeserver-dar2-0.0.1-transfix.pa
 Patch3: smeserver-dar2-0.0.1-locale-2008-04-20.patch
 Patch4: smeserver-dar2-0.0.1-locale-2008-04-22.patch
 Patch5: smeserver-dar2-0.0.1-locale-2008-04-23.patch
+Patch6: smeserver-dar2-0.0.1-add2general.patch
+Patch7: smeserver-dar2-0.0.1-locale-2008-04-26.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: dar => 2.3.1
 Requires: smeserver-release => 7.0
-Requires: perl-CGI-FormMagick => 0.92-08
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 %description
 SME Server implementation of Disk ARchive (http://dar.linux.free.fr)
 based on smeserver-backup2.
 
 %changelog
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-10
+- Take common <base> entries from e-smith-formmagick's general
+
 * Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.0.1-9
 - Fix changelog day
 
@@ -133,6 +138,8 @@ based on smeserver-backup2.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 /usr/bin/perl createlinks