rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix hostname requirement and conflict with openssl-libs

Browse Source
This commit is contained in:
Jan Kaluza 2014-09-03 16:17:05 +02:00
parent 36930381bc
commit b430bfe6b0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
httpd.spec
View File

@ -14,7 +14,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.10 Version: 2.4.10
Release: 10%{?dist} Release: 11%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -148,12 +148,12 @@ Group: System Environment/Daemons
Summary: SSL/TLS module for the Apache HTTP Server Summary: SSL/TLS module for the Apache HTTP Server
Epoch: 1 Epoch: 1
BuildRequires: openssl-devel BuildRequires: openssl-devel
Requires(post): openssl, /bin/cat, /bin/hostname Requires(post): openssl, /bin/cat, hostname
Requires(pre): httpd-filesystem Requires(pre): httpd-filesystem
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
Obsoletes: stronghold-mod_ssl Obsoletes: stronghold-mod_ssl
# Require an OpenSSL which supports PROFILE=SYSTEM # 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 %description -n mod_ssl
The mod_ssl module provides strong cryptography for the Apache Web 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 %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %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 * Mon Sep 01 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-10
- use KillMode=mixed in httpd.service (#1135122) - use KillMode=mixed in httpd.service (#1135122)