[ntp] 4.2.6p5-21

[Miroslav Lichvar]

commit 48ec8ae058e2a5fd2b9f6a006a9730c5aaa2bec6
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu Jul 3 18:13:37 2014 +0200

    4.2.6p5-21

 ntp.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/ntp.spec b/ntp.spec
index 6d8728a..ace3537 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -3,7 +3,7 @@
 Summary: The NTP daemon and utilities
 Name: ntp
 Version: 4.2.6p5
-Release: 20%{?dist}
+Release: 21%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -407,6 +407,11 @@ popd
 %{ntpdocdir}/html
 
 %changelog
+* Thu Jul 03 2014 Miroslav Lichvar <mlichvar at redhat.com> 4.2.6p5-21
+- disable monitor in default ntp.conf
+- warn when monitor can't be disabled due to limited restrict
+- add conflict with systemd-timesyncd service
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.6p5-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild