--- rpms/e-smith-hosts/sme8/e-smith-hosts.spec	2008/02/10 12:17:48	1.4
+++ rpms/e-smith-hosts/sme8/e-smith-hosts.spec	2008/07/08 18:17:55	1.8
@@ -1,7 +1,7 @@
 Summary: e-smith module for managing hosts entries
 Name: e-smith-hosts
 %define version 1.14.0
-%define release 12
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,10 +17,13 @@ Patch6: e-smith-hosts-1.14.0-no_global.p
 Patch7: e-smith-hosts-1.14.0-no_global.patch3
 Patch8: e-smith-hosts-1.14.0-removeEmptyEntry.patch
 Patch9: e-smith-hosts-1.14.0-rmDuplicates.patch
+Patch10: e-smith-hosts-1.14.0-add2general.patch
+Patch11: e-smith-hosts-1.14.0-hosttype.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base
 Requires: e-smith-lib >= 1.15.1-19
 Requires: e-smith-test >= 0.1.14
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
 AutoReqProv: no
@@ -30,6 +33,12 @@ e-smith module to allow the configuratio
 used to build the DNS and DHCP configuration.
 
 %changelog
+* Tue Jul 8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.0-14
+- Move single occurence HOSTTYPE back to e-smith-hosts
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.14.0-13
+- Add common <base> tags to e-smith-formmagick's general [SME: 4280]
+
 * Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.14.0-12
 - Remove duplicate <base> entries [SME: 3895]
 
@@ -1013,6 +1022,8 @@ used to build the DNS and DHCP configura
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks