diff --git a/ntp.spec b/ntp.spec index 1a8a162eee7be7d48d027e79af11d59d9a2b6562..0e95277d09c5f2506f573e76d00b75f389d003f8 100644 --- a/ntp.spec +++ b/ntp.spec @@ -2,7 +2,7 @@ Name: ntp Version: 4.2.8p14 -Release: 3 +Release: 4 Summary: A protocol designed to synchronize the clocks of computers over a network License: MIT and BSD and BSD with advertising URL: https://www.ntp.org/ @@ -208,6 +208,12 @@ make check %{_mandir}/man8/*.8* %changelog +* Sat Dec 4 2021 renmingshuai - 4.2.8p15-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: add conflict with chronyd.service in ntpd.service + * Mon Nov 09 2020 xihaochen - 4.2.8p14-3 - Type:requirement - CVE:NA diff --git a/ntpd.service b/ntpd.service index a638dad26d52df356ed931c57bda9a79c5053f61..8370bff63d57466e285d10ff51c6ad50a7050f84 100644 --- a/ntpd.service +++ b/ntpd.service @@ -1,7 +1,7 @@ [Unit] Description=Network Time Service After=syslog.target ntpdate.service sntp.service -Conflicts=systemd-timesyncd.service +Conflicts=chronyd.service systemd-timesyncd.service [Service] Type=forking