[packages/openssl102: 374/432] add ntpd conflict

[adwol]

commit e21ec158a50b78b97e9cc33dd7683b3654411a5c
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Aug 28 12:04:16 2015 +0300

    add ntpd conflict
    
    see
    https://github.com/pld-linux/ntp/commit/6a22ef3dfdfc575e06af5df4eaef25a4c546f257

 openssl.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/openssl.spec b/openssl.spec
index 836bca1..ea68ba4 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -23,7 +23,7 @@ Name:		openssl
 # Version 1.0.2 will be supported until 2019-12-31.
 # https://www.openssl.org/about/releasestrat.html
 Version:	1.0.2d
-Release:	3
+Release:	4
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -54,6 +54,7 @@ Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
 %if "%{pld_release}" == "ac"
+Conflicts:	ntpd < 4.2.4p8-10
 Conflicts:	openssh-clients < 2:5.8p1-9
 Conflicts:	openssh-server < 2:5.8p1-9
 %else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e