--- rpms/e-smith-ntp/sme8/e-smith-ntp.spec	2007/07/09 18:50:38	1.3
+++ rpms/e-smith-ntp/sme8/e-smith-ntp.spec	2010/10/12 06:20:07	1.11
@@ -1,28 +1,52 @@
+# $Id: e-smith-ntp.spec,v 1.10 2010/10/12 06:17:08 vip-ire Exp $
+
 Summary: e-smith specific NTP configuration files and templates
 %define name e-smith-ntp
 Name: %{name}
-%define version 1.16.0
-%define release 12
+%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-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
-Patch3: e-smith-ntp-1.16.0-ChangeInitialtoFirstDateTimePanel.patch
-Patch4: e-smith-ntp-1.16.0-smeserver.pool.patch
-Patch5: e-smith-ntp-1.16.0-migratepool.patch
+Patch0: e-smith-ntp-2.2.0-no-pool.ntp.org.patch
+Patch1: e-smith-ntp-2.2.0-support_large_drifts.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 12 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-3.sme
+- Support large drifts [SME: 5648]
+
+* Tue Jun 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Do not allow pool.ntp.org as NTP server [SME: 5957]
+
+* 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]
+
+* 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]
 
@@ -667,10 +691,6 @@ Configuration files and templates for th
 %setup
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 for i in ip-change post-install post-upgrade timeserver-update \