up to 1.0.2h snap

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 9a862f05bacd0d71e7efec4a24bf88e19bfbe977..2b25f08be0b380e2500c32b64e3112ef9205e39a 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -24,8 +24,8 @@ 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:       4
+Version:       1.0.2h
+Release:       0.1
 License:       Apache-like
 Group:         Libraries
 %if %{without snap}
@@ -65,15 +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 < 1: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:     php52-common < 4:5.2.17-20130717.14
-Conflicts:     php53-common < 4:5.3.29-26
-Conflicts:     php55-common < 4:5.5.31-2
-Conflicts:     php56-common < 4:5.6.17-2
-Conflicts:     ruby-modules < 1:2.0.0.648-2
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -298,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 \