[packages/openssl] 3a24c9cc conflicts don't apply for ac

glen glen at pld-linux.org
Wed Dec 31 13:28:31 CET 2014


commit c04ce0ebe4dbeb92db0e36be6c52f4c2c0c9569a
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Dec 31 14:28:04 2014 +0200

    3a24c9cc conflicts don't apply for ac

 openssl.spec | 2 ++
 1 file changed, 2 insertions(+)
---
diff --git a/openssl.spec b/openssl.spec
index e58f714..39e6135 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -54,9 +54,11 @@ Obsoletes:	SSLeay
 Obsoletes:	SSLeay-devel
 Obsoletes:	SSLeay-perl
 Obsoletes:	libopenssl0
+%if "%{pld_release}" != "ac"
 Conflicts:	neon < 0.29.6-8
 Conflicts:	openssh-clients < 2:6.2p2-3
 Conflicts:	openssh-server < 2:6.2p2-3
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl.git/commitdiff/c04ce0ebe4dbeb92db0e36be6c52f4c2c0c9569a



More information about the pld-cvs-commit mailing list