--- rpms/e-smith-ntp/sme7/e-smith-ntp.spec	2007/06/12 15:49:36	1.1
+++ rpms/e-smith-ntp/sme7/e-smith-ntp.spec	2008/10/07 18:47:10	1.8
@@ -1,25 +1,53 @@
+# $Id$
+
 Summary: e-smith specific NTP configuration files and templates
 %define name e-smith-ntp
 Name: %{name}
-%define version 1.16.0
-%define release 9
+%define version 2.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-ntp-1.16.0-success.patch
-Patch1: e-smith-ntp/P/e-smith-ntp-1.16.0-hwsync.patch
-Patch2: e-smith-ntp-1.16.0-memlimit.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools >= 1.13.1-03
+Requires: e-smith-formmagick >= 1.4.0-9
 Requires: e-smith-base
 Requires: ntp
 Requires: e-smith-lib >= 1.15.1-19
 AutoReqProv: no
 
 %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]
+
+* Mon Jul 7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.16.0-17
+- Remove <base> tags now in general [SME: 3923]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.16.0-16
+- Remove <base> tags now in general [SME: 3923]
+
+* Sat Feb 09 2008 Gavin Weight <gweight@gmail.com> 1.16.0-15
+- Remove the expand-template as set in previous patch, as we already
+  expand correct places. [SME: 3868]
+
+* Fri Feb 8 2008 Filippo Carletti <filippo.carletti@gmail.com> 1.16.0-14
+- Choose correct step-ticker for pool.ntp.org hosts. [SME: 3868]
+
+* Fri Nov 30 2007 Gavin Weight <gweight@gmail.com> 1.16.0-13
+- Fix use of uninitialized value in 30pool migrate. [SME: 3594]
+
+* Sun Jul 08 2007 Stephen Noble <support@dungog.net> 1.16.0-12
+- Migrate pool.ntp.org to smeserver.pool.ntp.org [SME: 1426]
+
+* Sun Jul 08 2007 Stephen Noble <support@dungog.net> 1.16.0-11
+- Change default to smeserver.pool.ntp.org [SME: 1426]
+ 
+* Tue Jun 26 2007 Gavin Weight <gweight@gmail.com> 1.16.0-10
+- Change Initial to First in the Datetime panel. [SME: 3108]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -653,9 +681,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 for i in ip-change post-install post-upgrade timeserver-update \