commit 36357edc5a4d68d38b0f4f757d5c5fc3638fe6bb
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Dec 8 21:57:02 2014 +0100
- rel 11; add Conflicts=systemd-timesyncd.service
ntp.spec | 2 +-
ntpd.service | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ntp.spec b/ntp.spec
index f4eb245..a822520 100644
--- 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 03f38ed..e97dc3f 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ntp.git/commitdiff/36357edc5a4d68d38b0f4f757d5c5fc3638fe6bb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
