From 5562449e9f730c858b1a9c534587352388771ff8e174245b456a6eed23bf0aba Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 23 Oct 2019 07:34:11 +0000
Subject: [PATCH] Accepting request 741936 from
 home:adkorte:branches:openSUSE:Factory

- Fix asciidoc in Tumbleweed
- Revert clknetsim to version 58c5e8b
- Fix incorrect download link for package signature

OBS-URL: https://build.opensuse.org/request/show/741936
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=73
---
 chrony-3.5.tar.gz.sig    |  6 ++++++
 chrony.changes           | 11 +++++++++++
 chrony.spec              |  7 +++++--
 clknetsim-58c5e8b.tar.gz |  3 +++
 clknetsim-ac3c832.tar.gz |  3 ---
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 chrony-3.5.tar.gz.sig
 create mode 100644 clknetsim-58c5e8b.tar.gz
 delete mode 100644 clknetsim-ac3c832.tar.gz

diff --git a/chrony-3.5.tar.gz.sig b/chrony-3.5.tar.gz.sig
new file mode 100644
index 0000000..62692ba
--- /dev/null
+++ b/chrony-3.5.tar.gz.sig
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iEYEABECAAYFAlzan7cACgkQX/BvKboeATtxzQCffUevHEDrRWPbdK9drojf97s1
+9kIAn0onspGVxrj21mhFtd1vNjsSG+8f
+=AveM
+-----END PGP SIGNATURE-----
diff --git a/chrony.changes b/chrony.changes
index 9c8535d..cf907e7 100644
--- a/chrony.changes
+++ b/chrony.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Oct 22 21:18:58 UTC 2019 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fix asciidoc in Tumbleweed
+- Revert clknetsim to version 58c5e8b
+
+-------------------------------------------------------------------
+Tue Oct 22 15:25:18 UTC 2019 - Arjen de Korte <suse+build@de-korte.org>
+
+- Fix incorrect download link for package signature
+
 -------------------------------------------------------------------
 Mon Oct 21 07:57:44 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
 
diff --git a/chrony.spec b/chrony.spec
index f284d85..83fbe8c 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -17,7 +17,7 @@
 
 
 %define vendorzone opensuse.
-%global clknetsim_ver ac3c832
+%global clknetsim_ver 58c5e8b
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -35,7 +35,7 @@ Source3:        chrony.dhclient
 Source4:        chrony.helper
 Source5:        chrony-dnssrv@.service
 Source6:        chrony-dnssrv@.timer
-#Source7:        https://download.tuxfamily.org/chrony/chrony-3.4-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
+Source7:        https://download.tuxfamily.org/chrony/chrony-%{version}-tar-gz-asc.txt#/chrony-%{version}.tar.gz.sig
 Source8:        chrony.keyring
 # Simulator for test suite
 Source10:       https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
@@ -67,6 +67,9 @@ Provides:       ntp-daemon
 %if 0%{?suse_version} == 1500 && 0%{?is_opensuse} && !0%{?is_backports}
 BuildRequires:  ruby2.5-rubygem-asciidoctor
 %endif
+%if %{?suse_version} >= 1550
+BuildRequires:  ruby2.6-rubygem-asciidoctor
+%endif
 %ifarch s390 s390x ppc64le
 BuildRequires:  libseccomp-devel >= 2.2.0
 %else
diff --git a/clknetsim-58c5e8b.tar.gz b/clknetsim-58c5e8b.tar.gz
new file mode 100644
index 0000000..d101e00
--- /dev/null
+++ b/clknetsim-58c5e8b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63566698c2c4bf70abd999666a02d52d00a85e68990bbed0361ffc50c9edf945
+size 42424
diff --git a/clknetsim-ac3c832.tar.gz b/clknetsim-ac3c832.tar.gz
deleted file mode 100644
index be307e0..0000000
--- a/clknetsim-ac3c832.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7aae6e77622f3f0db33bc5a2bab55548ccadf6f19432923a0855f10fca9b3de
-size 45455