summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJan Kaluza <jkaluza@redhat.com>2014-09-03 16:17:05 +0200
committerJan Kaluza <jkaluza@redhat.com>2014-09-03 16:17:05 +0200
commitb430bfe6b0a93a0d73c6dc41990a81523b6ab163 (patch)
treefb74ffdc58fa77d06ed91702e68d57f8fa476092 /httpd.spec
parent36930381bc186af121a2439f92b8fe2c2c6f3acc (diff)
downloadhttpd-b430bfe6b0a93a0d73c6dc41990a81523b6ab163.tar.gz
httpd-b430bfe6b0a93a0d73c6dc41990a81523b6ab163.tar.xz
httpd-b430bfe6b0a93a0d73c6dc41990a81523b6ab163.zip
fix hostname requirement and conflict with openssl-libs
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec9
1 files changed, 6 insertions, 3 deletions
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)