up to 1.0.2e, fails to build on carme jpaketest.c

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 12064edc5809d517c54a35dfdbfa181f5bcca621..5f510ffe00c976fb9ed020cbcff809eb8707610e 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -1,5 +1,6 @@
 # TODO
 # - consider dropping last optflags.patch hunk and return to SOMAJOR (.so.1) sonames
+# - find a way to simplify (drop) openssl-optflags.patch, it's pain to update here in pld
 #
 # Conditional build:
 %bcond_without tests   # don't perform "make tests"
@@ -22,12 +23,12 @@ Name:               openssl
 # 1.0.2 will be LTS release
 # Version 1.0.2 will be supported until 2019-12-31.
 # https://www.openssl.org/about/releasestrat.html
-Version:       1.0.2d
+Version:       1.0.2e
 Release:       1
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5: 38dd619b2e77cbac69b99f52a053d25a
+# Source0-md5: 2218c1a6f807f7206c11eb3ee3a5ec80
 Source2:       %{name}.1.pl
 Source3:       %{name}-ssl-certificate.sh
 Source4:       %{name}-c_rehash.sh
@@ -53,7 +54,12 @@ Obsoletes:   SSLeay
 Obsoletes:     SSLeay-devel
 Obsoletes:     SSLeay-perl
 Obsoletes:     libopenssl0
-%if "%{pld_release}" != "ac"
+%if "%{pld_release}" == "ac"
+Conflicts:     neon < 0.26.3-3
+Conflicts:     ntpd < 4.2.4p8-10
+Conflicts:     openssh-clients < 2:5.8p1-9
+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