From 2f2da7fa4e16afa564f8dcd6aff86c841759f590 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 3 Feb 2021 12:07:41 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/chrony.git#65b8f20ff63288427e5425a3981e895dc88b7a46
---
 chrony-dnssrv@.service |  8 --------
 chrony-dnssrv@.timer   |  9 ---------
 chrony.spec            | 11 +++++------
 3 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 chrony-dnssrv@.service
 delete mode 100644 chrony-dnssrv@.timer

diff --git a/chrony-dnssrv@.service b/chrony-dnssrv@.service
deleted file mode 100644
index 139ed28..0000000
--- a/chrony-dnssrv@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=DNS SRV lookup of %I for chrony
-After=chronyd.service network-online.target
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/libexec/chrony-helper update-dnssrv-servers %I
diff --git a/chrony-dnssrv@.timer b/chrony-dnssrv@.timer
deleted file mode 100644
index 8495e01..0000000
--- a/chrony-dnssrv@.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Periodic DNS SRV lookup of %I for chrony
-
-[Timer]
-OnActiveSec=0
-OnUnitInactiveSec=1h
-
-[Install]
-WantedBy=timers.target
diff --git a/chrony.spec b/chrony.spec
index 3e42b2c..dc39db6 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -5,7 +5,7 @@
 
 Name:           chrony
 Version:        4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An NTP client/server
 
 License:        GPLv2
@@ -14,8 +14,6 @@ Source0:        https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerel
 Source1:        https://download.tuxfamily.org/chrony/chrony-%{version}%{?prerelease}-tar-gz-asc.txt
 Source2:        https://chrony.tuxfamily.org/gpgkey-8B1F4A9ADA73D401E3085A0B5FF06F29BA1E013B.asc
 Source3:        chrony.dhclient
-Source5:        chrony-dnssrv@.service
-Source6:        chrony-dnssrv@.timer
 # simulator for test suite
 Source10:       https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz
 %{?gitpatch:Patch0: chrony-%{version}%{?prerelease}-%{gitpatch}.patch.gz}
@@ -29,6 +27,7 @@ BuildRequires:  libcap-devel libedit-devel nettle-devel pps-tools-devel
 BuildRequires:  libseccomp-devel
 %endif
 BuildRequires:  gcc gcc-c++ bison systemd gnupg2 net-tools
+BuildRequires: make
 %{?with_nts:BuildRequires: gnutls-devel gnutls-utils}
 
 Requires(pre):  shadow-utils
@@ -140,8 +139,6 @@ install -m 755 -p examples/chrony.nm-dispatcher.dhcp \
         $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d/20-chrony-dhcp
 install -m 644 -p examples/chrony-wait.service \
         $RPM_BUILD_ROOT%{_unitdir}/chrony-wait.service
-install -m 644 -p %{SOURCE5} $RPM_BUILD_ROOT%{_unitdir}/chrony-dnssrv@.service
-install -m 644 -p %{SOURCE6} $RPM_BUILD_ROOT%{_unitdir}/chrony-dnssrv@.timer
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/chronyd <<EOF
 # Command-line options for chronyd
@@ -200,7 +197,6 @@ fi
 %{_prefix}/lib/NetworkManager
 %{_prefix}/lib/systemd/ntp-units.d/*.list
 %{_unitdir}/chrony*.service
-%{_unitdir}/chrony*.timer
 %{_mandir}/man[158]/%{name}*.[158]*
 %dir %attr(750,chrony,chrony) %{_localstatedir}/lib/chrony
 %ghost %attr(-,chrony,chrony) %{_localstatedir}/lib/chrony/drift
@@ -208,6 +204,9 @@ fi
 %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Wed Oct 07 2020 Miroslav Lichvar <mlichvar@redhat.com> 4.0-1
 - update to 4.0
 - update directory permissions to follow upstream