--- rpms/e-smith-hosts/sme8/e-smith-hosts.spec	2008/04/28 19:14:03	1.6
+++ rpms/e-smith-hosts/sme8/e-smith-hosts.spec	2010/09/26 19:04:49	1.12
@@ -1,27 +1,22 @@
+# $Id: e-smith-hosts.spec,v 1.11 2010/09/26 18:15:08 slords Exp $
+
 Summary: e-smith module for managing hosts entries
 Name: e-smith-hosts
-%define version 1.14.0
-%define release 13
+%define version 2.2.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-hosts-1.14.0-hostentriesformatting.patch
-Patch1: e-smith-hosts-1.14.0-hostentriesformatting.patch2
-Patch2: e-smith-hosts-1.14.0-comment.patch
-Patch3: e-smith-hosts-1.14.0-success.patch
-Patch4: e-smith-hosts-1.14.0-thenumbers.patch
-Patch5: e-smith-hosts-1.14.0-no_global.patch
-Patch6: e-smith-hosts-1.14.0-no_global.patch2
-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
+Patch1: e-smith-hosts-2.2.0_allow_cname.patch
+Patch2: e-smith-hosts-2.2.0-host_ip_validator.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
+Requires: e-smith-tinydns >= 2.2.0-2
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
 AutoReqProv: no
@@ -31,6 +26,18 @@ e-smith module to allow the configuratio
 used to build the DNS and DHCP configuration.
 
 %changelog
+* Sun Sep 25 2010 Shad L. Lords <slords@mail.com> 2.2.0-3.sme
+- Add validator back for ip or cname entry [SME: 3132]
+
+* Thu Jul 29 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-2.sme
+- Allow use of CNAME in remote hosts [SME: 3132]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* 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]
 
@@ -1007,17 +1014,8 @@ used to build the DNS and DHCP configura
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
 perl createlinks