From: Elan Ruusamäe <glen@delfi.ee>
Date: Mon, 17 Aug 2015 08:13:10 +0000 (+0300)
Subject: update openssh conflict for ac
X-Git-Tag: auto/ac/openssl-1.0.2d-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=4ec787aee97eab375518ac21f59292daf286a3e5

update openssh conflict for ac
---

diff --git a/openssl.spec b/openssl.spec
index 12064ed..6b55068 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:	1
+Release:	2
 License:	Apache-like
 Group:		Libraries
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -53,7 +53,9 @@ Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
-%if "%{pld_release}" != "ac"
+%if "%{pld_release}" == "ac"
+Conflicts:	openssh-server < 2:5.8p1-9
+%else
 Conflicts:	neon < 0.29.6-8
 Conflicts:	openssh-clients < 2:6.2p2-3
 Conflicts:	openssh-server < 2:6.2p2-3