--- rpms/e-smith-dnscache/sme7/e-smith-dnscache.spec	2007/06/12 15:19:08	1.1
+++ rpms/e-smith-dnscache/sme7/e-smith-dnscache.spec	2008/10/07 18:01:45	1.7
@@ -1,16 +1,15 @@
+# $Id$
+
 Summary: e-smith module to configure dnscache
 %define name e-smith-dnscache
 Name: %{name}
-%define version 1.0.0
-%define release 6
+%define version 2.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-dnscache-1.0.0.validateNameServer.patch
-Patch1: e-smith-dnscache-1.0.0-dnscacne_servers.patch
-Patch2: e-smith-dnscache-1.0.0-dnscacne_forwarder.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-lib >= 1.15.1-19
@@ -23,6 +22,37 @@ e-smith server enhancement to configure
 caching nameserver
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Fri Aug 08 2008 Charlie Brady <charlie_brady@mitel.com> 1.0.0-13
+- Add down file for dnscache.forwarder, and modify dnscache run file
+  so that it brings up the dnscache.forwarder service when it
+  is started. [SME: 4414]
+
+* Fri Aug 08 2008 Charlie Brady <charlie_brady@mitel.com> 1.0.0-12
+- Ensure that forwarding instance of dnscache has random data
+  available on stdin. [SME: 4416]
+
+* Wed Jun 18 2008 Charlie Brady <charlie_brady@mitel.com> 1.0.0-11
+- Use new address for L root server, and delete included version of
+  root/servers/@ file, since we template it. [SME: 4414]
+
+* Wed Jun 18 2008 Charlie Brady <charlie_brady@mitel.com> 1.0.0-10
+- Fix validation of NameServer properties pulled from networks db.
+  [SME: 1343]
+
+* Wed Jun 18 2008 Charlie Brady <charlie_brady@mitel.com> 1.0.0-9
+- Fix delegation of reverse lookup for nets which aren't /8,
+  /16 or /24. [SME: 4249]
+
+* Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 1.0.0-08
+- Increase default CacheSize to 10M, with corresponding increase
+  in DataSize. [SME: 2371]
+
+* Thu Sep  6 2007 Charlie Brady <charlie_brady@mitel.com> 1.0.0-07
+- Run dnscache with sigpipe ignored. [SME: 938]
+
 * Mon May 21 2007 Shad L. Lords <slords@mail.com> 1.0.0-6
 - Ensure Forwarder has value and not just defined [SME: 3013]
 
@@ -402,9 +432,6 @@ caching nameserver
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 perl createlinks
@@ -417,6 +444,7 @@ touch root/var/service/dnscache/down
 mkdir -p root/var/log/dnscache
 mkdir -p root/var/log/dnscache.forwarder
 mkdir -p root/var/service/dnscache.forwarder/root/ip
+touch root/var/service/dnscache.forwarder/down
 touch root/var/service/dnscache.forwarder/root/ip/127