From 1561aa57290dcd4fc60c6e1c4481b9d38baa6951 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Apr 12 2010 11:50:03 +0000
Subject: - update to 4.2.6p1


---

diff --git a/.cvsignore b/.cvsignore
index a7f68fa..cdd7259 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 ntpstat-0.2.tgz
 timepps.h
-ntp-4.2.6p1-RC5.tar.gz
+ntp-4.2.6p1.tar.gz
diff --git a/ntp-4.2.6p1-mlock.patch b/ntp-4.2.6p1-mlock.patch
index 975b37d..7da4454 100644
--- a/ntp-4.2.6p1-mlock.patch
+++ b/ntp-4.2.6p1-mlock.patch
@@ -93,8 +93,8 @@ diff -up ntp-4.2.6p1/ntpd/ntpd-opts.h.mlock ntp-4.2.6p1/ntpd/ntpd-opts.h
  
 -#define OPTION_CT    35
 +#define OPTION_CT    36
- #define NTPD_VERSION       "4.2.6p1-RC5"
- #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p1-RC5"
+ #define NTPD_VERSION       "4.2.6p1"
+ #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.6p1"
  
 @@ -182,6 +183,10 @@ typedef enum {
  #  warning undefining MODIFYMMTIMER due to option name conflict
diff --git a/ntp.spec b/ntp.spec
index 4796b93..fe1f87e 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,8 +1,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.6p1
-%define rc_ver -RC5
-Release: 0.1.rc5%{?dist}
+Release: 1%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -28,7 +27,7 @@ Release: 0.1.rc5%{?dist}
 # util/ansi2knr.c (not used) : GPL+
 License: (MIT and BSD and BSD with advertising) and GPLv2
 Group: System Environment/Daemons
-Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}%{?rc_ver}.tar.gz
+Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.gz
 Source1: ntp.conf
 Source2: ntp.keys
 Source3: ntpd.init
@@ -131,7 +130,7 @@ This package contains NTP documentation in HTML format.
 %endif
 
 %prep
-%setup -q -a 5 -n %{name}-%{version}%{?rc_ver}
+%setup -q -a 5
 
 cp %{SOURCE11} include
 
@@ -331,6 +330,9 @@ fi
 %{ntpdocdir}/html
 
 %changelog
+* Mon Apr 12 2010 Miroslav Lichvar <mlichvar@redhat.com> 4.2.6p1-1
+- update to 4.2.6p1
+
 * Fri Mar 19 2010 Miroslav Lichvar <mlichvar@redhat.com> 4.2.6p1-0.1.rc5
 - update to 4.2.6p1-RC5
 - support NTPSERVERARGS variable in dhclient script (#558110)
diff --git a/sources b/sources
index 6714733..f64376b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 6b2bedefe2e7c63ea52609b222022121  ntpstat-0.2.tgz
 b494eddf72f3455c333eed80642dc20d  timepps.h
-7080acba1d742af81c101d4028f83642  ntp-4.2.6p1-RC5.tar.gz
+0510396dfbde40678b92f808ec07c0d2  ntp-4.2.6p1.tar.gz