X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=e85f944d39ee8ba879cdfce3f2ee0af71d8b549d;hp=82ce75f456abfc61321bbdc5f9486e1c9de30354;hb=ab4f815;hpb=3587e6a01dfacee86f8123a1b847ed7f7eb27185;ds=sidebyside

diff --git a/openssl.spec b/openssl.spec
index 82ce75f..e85f944 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -24,13 +24,13 @@ 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.2g
-Release:	3
+Version:	1.0.2h
+Release:	1
 License:	Apache-like
 Group:		Libraries
 %if %{without snap}
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	f3c710c045cdee5fd114feb69feba7aa
+# Source0-md5:	9392e65072ce4b614c1392eefc1f23d0
 %else
 Source1:	https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
 %endif
@@ -65,11 +65,9 @@ Conflicts:	ntpd < 4.2.4p8-10
 Conflicts:	openssh-clients < 2:5.8p1-9
 Conflicts:	openssh-server < 2:5.8p1-9
 %else
-Conflicts:	apache-mod_ssl < 2.2.31-4
 Conflicts:	neon < 0.29.6-8
 Conflicts:	openssh-clients < 2:6.2p2-3
 Conflicts:	openssh-server < 2:6.2p2-3
-Conflicts:	ruby-modules < 1:2.0.0.648-2
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -294,8 +292,8 @@ PERL="%{__perl}" \
 	--libdir=%{_lib} \
 	shared \
 	threads \
-	%{!?with_sslv2:no-ssl2} \
-	%{!?with_sslv3:no-ssl3} \
+	%{?with_sslv2:enable-ssl2}%{!?with_sslv2:no-ssl2} \
+	%{?with_sslv3:enable-ssl3}%{!?with_sslv3:no-ssl3} \
 	%{!?with_zlib:no-}zlib \
 	enable-camelia \
 	enable-cms \