[packages/openssl102: 397/432] mod_ssl epoch

[adwol]

commit 7d45780a1e29593ee28c79d2a38c0cb5775f40e2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 2 16:25:38 2016 +0200

    mod_ssl epoch

 openssl.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 82ce75f..34e6b33 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -25,7 +25,7 @@ Name:		openssl
 # Version 1.0.2 will be supported until 2019-12-31.
 # https://www.openssl.org/about/releasestrat.html
 Version:	1.0.2g
-Release:	3
+Release:	4
 License:	Apache-like
 Group:		Libraries
 %if %{without snap}
@@ -65,7 +65,7 @@ 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:	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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e