--- rpms/smeserver-ddclient/contribs7/smeserver-ddclient.spec	2008/04/26 09:50:33	1.3
+++ rpms/smeserver-ddclient/contribs7/smeserver-ddclient.spec	2008/04/28 23:21:44	1.6
@@ -1,4 +1,4 @@
-# $Id: smeserver-ddclient.spec,v 1.2 2008/04/23 17:50:41 snetram Exp $
+# $Id: smeserver-ddclient.spec,v 1.5 2008/04/28 17:54:17 slords Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -15,17 +15,21 @@ Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-ddclient-1.0.0-locale-2008-04-23.patch
 Patch1: smeserver-ddclient-1.0.0-locale-2008-04-26.patch
+Patch2: smeserver-ddclient-1.0.0-dos2unix.patch
+Patch3: smeserver-ddclient-1.0.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 Obsoletes: sme7-ddclient
 BuildArchitectures: noarch
 Requires: SMEServer >= 7
 Requires: ddclient >= 3.7
+Requires: e-smith-formmagick >= 1.4.0-12
 AutoReqProv: no
 
 %changelog
 * Sat Apr 26 2008 Jonathan Martens  <smeserver-contribs@snetram.nl> 1.0.0-4
 - Added 26 April 2008 locale patch
+- Add common <base> tags to e-smith-formmagick's general
 
 * Wed Apr 23 2008 Jonathan Martens  <smeserver-contribs@snetram.nl> 1.0.0-3
 - Added 23 April 2008 locale patch
@@ -66,6 +70,8 @@ ddclient panel and config files for SME7
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks