X-Git-Url: https://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=29d51d2e64e6fc5a84ee8220983ac07b38e84803;hp=591bd8085d15e2d31440a1ad5766b8f2df726027;hb=90d5519;hpb=16a987986935311661129015c54305467b01d5e0

diff --git a/openssl.spec b/openssl.spec
index 591bd80..29d51d2 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -24,15 +24,15 @@ 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.2f
-Release:	1
+Version:	1.0.2g
+Release:	6
 License:	Apache-like
 Group:		Libraries
 %if %{without snap}
 Source0:	ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
-# Source0-md5:	b3bf73f507172be9292ea2a8c28b659d
+# Source0-md5:	f3c710c045cdee5fd114feb69feba7aa
 %else
-Source1:	https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable.tar.gz
+Source1:	https://github.com/openssl/openssl/archive/OpenSSL_1_0_2-stable/%{name}-%{version}-dev.tar.gz
 %endif
 Source2:	%{name}.1.pl
 Source3:	%{name}-ssl-certificate.sh
@@ -65,9 +65,20 @@ Conflicts:	ntpd < 4.2.4p8-10
 Conflicts:	openssh-clients < 2:5.8p1-9
 Conflicts:	openssh-server < 2:5.8p1-9
 %else
+Conflicts:	QtNetwork < 4.8.7-8
+Conflicts:	apache-mod_ssl < 1:2.2.31-4
+Conflicts:	curl-libs < 7.47.1-2
 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.17
+Conflicts:	php53-common < 4:5.3.29-27
+Conflicts:	php54-common < 4:5.4.45-5
+Conflicts:	php55-common < 4:5.5.32-2
+Conflicts:	php56-common < 4:5.6.18-3
+Conflicts:	python-modules < 1:2.7.10-8
+Conflicts:	python3-modules < 1:3.5.0-9
+Conflicts:	ruby-modules < 1:2.0.0.648-2
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -274,7 +285,9 @@ mv %{name}-OpenSSL_1_0_2-stable/* .
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%ifarch x32
 %patch10 -p1
+%endif
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure