diff --git a/ntp.spec b/ntp.spec index 54b9cc003ca34911c0e172f728b0b1b929dbe8ef..ffdc3df98042ed20b9fffc22afa71667724c62c2 100644 --- a/ntp.spec +++ b/ntp.spec @@ -2,7 +2,7 @@ Name: ntp Version: 4.2.8p14 -Release: 4 +Release: 5 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/ @@ -209,6 +209,12 @@ make check %{_mandir}/man8/*.8* %changelog +* Sat Dec 4 2021 renmingshuai - 4.2.8p15-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: add conflict with chronyd.service in ntpd.service + * Sun Nov 29 2020 wangxiaopeng - 4.2.8p14-4 - Type:bugfix - ID: 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