apache 2.2 bump

https://github.com/pld-linux/apache/commit/0bc39fbc11debf1f75be420bf6886097f802bf32

diff --git a/openssl.spec b/openssl.spec
index 159da5c35feb9471ac100ec467554b11a07b8cfd..82ce75f456abfc61321bbdc5f9486e1c9de30354 100644 (file)
--- 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:       2
+Release:       3
 License:       Apache-like
 Group:         Libraries
 %if %{without snap}
@@ -65,6 +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:     neon < 0.29.6-8
 Conflicts:     openssh-clients < 2:6.2p2-3
 Conflicts:     openssh-server < 2:6.2p2-3