From b430bfe6b0a93a0d73c6dc41990a81523b6ab163 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Sep 03 2014 14:17:05 +0000
Subject: fix hostname requirement and conflict with openssl-libs


---

diff --git a/httpd.spec b/httpd.spec
index 68683b1..347e8da 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.10
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -148,12 +148,12 @@ Group: System Environment/Daemons
 Summary: SSL/TLS module for the Apache HTTP Server
 Epoch: 1
 BuildRequires: openssl-devel
-Requires(post): openssl, /bin/cat, /bin/hostname
+Requires(post): openssl, /bin/cat, hostname
 Requires(pre): httpd-filesystem
 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
 Obsoletes: stronghold-mod_ssl
 # Require an OpenSSL which supports PROFILE=SYSTEM
-Conflicts: openssl < 1:1.0.1h-4
+Conflicts: openssl-libs < 1:1.0.1h-4
 
 %description -n mod_ssl
 The mod_ssl module provides strong cryptography for the Apache Web
@@ -669,6 +669,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Wed Sep 03 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-11
+- fix hostname requirement and conflict with openssl-libs
+
 * Mon Sep 01 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-10
 - use KillMode=mixed in httpd.service (#1135122)