- rel 11; add Conflicts=systemd-timesyncd.service

diff --git a/ntp.spec b/ntp.spec
index f4eb2456bc3560e7ae128f08205c02d5f564ec9e..a822520fa5f1e055336b760780874b5c617e4aa1 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):  Network Time Protocol versão 4
 Name:          ntp
 Version:       4.2.6p5
-Release:       10
+Release:       11
 License:       distributable
 Group:         Networking/Daemons
 Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz

diff --git a/ntpd.service b/ntpd.service
index 03f38ed2c2d8ad78f587683b98a32354ea276024..e97dc3ff706151ef22a30a18ce5e1d8e010826fa 100644 (file)
--- a/ntpd.service
+++ b/ntpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Network Time Service
 After=syslog.target ntpdate.service
+Conflicts=systemd-timesyncd.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/ntpd