From 0a37b7a3ed2d18a9af14327a53212d2eeae43095d08c1adb59a5a102d9b70888 Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Mon, 18 Apr 2016 13:56:40 +0000
Subject: [PATCH] - Calls to sntp adjusted to the syntax of ntp 4.2.8  
 (bnc#937837, bnc#916617, FATE#320392) - 3.1.22

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-ntp-client?expand=0&rev=210
---
 yast2-ntp-client-3.1.21.tar.bz2 | 3 ---
 yast2-ntp-client-3.1.22.tar.bz2 | 3 +++
 yast2-ntp-client.changes        | 7 +++++++
 yast2-ntp-client.spec           | 4 +++-
 4 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 yast2-ntp-client-3.1.21.tar.bz2
 create mode 100644 yast2-ntp-client-3.1.22.tar.bz2

diff --git a/yast2-ntp-client-3.1.21.tar.bz2 b/yast2-ntp-client-3.1.21.tar.bz2
deleted file mode 100644
index 397fb3b..0000000
--- a/yast2-ntp-client-3.1.21.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4640f4ac67bae92ad509358e3d79e439f7bf56fd296c7efc5b9376641673ad9e
-size 64944
diff --git a/yast2-ntp-client-3.1.22.tar.bz2 b/yast2-ntp-client-3.1.22.tar.bz2
new file mode 100644
index 0000000..e144161
--- /dev/null
+++ b/yast2-ntp-client-3.1.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ddb11f7573d7fff7073b138e9e97a01cd3e2e0bad977f7e609843a54a744ec9
+size 65157
diff --git a/yast2-ntp-client.changes b/yast2-ntp-client.changes
index 21f4f18..243943f 100644
--- a/yast2-ntp-client.changes
+++ b/yast2-ntp-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 14 09:16:37 CEST 2016 - kanderssen@suse.com
+
+- Calls to sntp adjusted to the syntax of ntp 4.2.8
+  (bnc#937837, bnc#916617, FATE#320392)
+- 3.1.22
+
 -------------------------------------------------------------------
 Fri Nov 13 10:59:21 UTC 2015 - igonzalezsosa@suse.com
 
diff --git a/yast2-ntp-client.spec b/yast2-ntp-client.spec
index 86f05cd..91f94cd 100644
--- a/yast2-ntp-client.spec
+++ b/yast2-ntp-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ntp-client
-Version:        3.1.21
+Version:        3.1.22
 Release:        0
 Summary:        YaST2 - NTP Client Configuration
 License:        GPL-2.0+
@@ -37,6 +37,8 @@ Requires:       yast2 >= 3.1.11
 Requires:       yast2-country-data
 Requires:       yast2-ruby-bindings >= 1.0.0
 BuildArch:      noarch
+# New sntp command line syntax
+Conflicts:      ntp < 4.2.8
 
 %description
 This package contains the YaST2 component for NTP client configuration.