From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 2 Mar 2016 14:25:38 +0000 (+0200)
Subject: mod_ssl epoch
X-Git-Tag: auto/th/openssl-1.0.2g-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=commitdiff_plain;h=7d45780a1e29593ee28c79d2a38c0cb5775f40e2

mod_ssl epoch
---

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